Date: Fri, 13 Nov 2009 14:40:14 GMT From: Alexander Best <alexbestms@wwu.de> To: freebsd-gnats-submit@FreeBSD.org Subject: bin/140530: [patch] make burncd(8) honour envar BURNCD_SPEED Message-ID: <200911131440.nADEeEDv004586@www.freebsd.org> Resent-Message-ID: <200911131450.nADEo1Oq063753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140530 >Category: bin >Synopsis: [patch] make burncd(8) honour envar BURNCD_SPEED >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 13 14:50:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alexander Best >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD otaku 9.0-CURRENT FreeBSD 9.0-CURRENT #4 r199236M: Thu Nov 12 23:30:19 CET 2009 root@otaku:/usr/obj/usr/src/sys/ARUNDEL i386 >Description: this patch makes burncd honour the envar BURNCD_SPEED. discussed with keramida@ and des@ in this thread: http://lists.freebsd.org/pipermail/freebsd-hackers/2009-November/029969.html the final patch can be found (apart from this pr) here: http://lists.freebsd.org/pipermail/freebsd-hackers/2009-November/029994.html cheers. alex >How-To-Repeat: >Fix: Patch attached with submission follows: Index: usr.sbin/burncd/burncd.8 =================================================================== --- usr.sbin/burncd/burncd.8 (revision 199236) +++ usr.sbin/burncd/burncd.8 (working copy) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 2, 2005 +.Dd Nov 9, 2009 .Os .Dt BURNCD 8 .Sh NAME @@ -158,7 +158,11 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev CDROM" +.Bl -tag -width ".Ev BURNCD_SPEED" +.It Ev BURNCD_SPEED +The write speed to use if one is not specified with the +.Fl s +flag. .It Ev CDROM The CD device to use if one is not specified with the .Fl f Index: usr.sbin/burncd/burncd.c =================================================================== --- usr.sbin/burncd/burncd.c (revision 199236) +++ usr.sbin/burncd/burncd.c (working copy) @@ -80,11 +80,13 @@ int dao = 0, eject = 0, fixate = 0, list = 0, multi = 0, preemp = 0; int nogap = 0, speed = 4 * 177, test_write = 0, force = 0; int block_size = 0, block_type = 0, cdopen = 0, dvdrw = 0; - const char *dev; + const char *dev, *env_speed; if ((dev = getenv("CDROM")) == NULL) dev = "/dev/acd0"; + env_speed = getenv("BURNCD_SPEED"); + while ((ch = getopt(argc, argv, "def:Flmnpqs:tv")) != -1) { switch (ch) { case 'd': @@ -124,12 +126,7 @@ break; case 's': - if (strcasecmp("max", optarg) == 0) - speed = CDR_MAX_SPEED; - else - speed = atoi(optarg) * 177; - if (speed <= 0) - errx(EX_USAGE, "Invalid speed: %s", optarg); + env_speed = optarg; break; case 't': @@ -147,6 +144,15 @@ argc -= optind; argv += optind; + if (env_speed == NULL) + ; + else if (strcasecmp("max", env_speed) == 0) + speed = CDR_MAX_SPEED; + else + speed = atoi(env_speed) * 177; + if (speed <= 0) + errx(EX_USAGE, "Invalid speed: %s", optarg); + if (argc == 0) usage(); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911131440.nADEeEDv004586>