diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-12-30 18:02:43 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-12-30 18:02:43 +0000 |
| commit | a549690c0b0aa805998c64929fb042224d13e566 (patch) | |
| tree | c3ec54fa0a5a3701d203e66a0d5bd29f61f1aa20 /sysutils | |
| parent | Vendor update to 2.46 (diff) | |
Correct the order in which we obtain read and write speeds so as not to
tokenize out the write speed before we process it.
Notes
Notes:
svn path=/head/; revision=96964
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-cd-drive.c | 46 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 13c91d0187dc..82a0a6ecfcbb 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -7,7 +7,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 0.5.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c index 220d41b14b0a..aea6a2e1289f 100644 --- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c @@ -1,5 +1,5 @@ --- cd-drive.c.orig Mon Sep 8 15:24:07 2003 -+++ cd-drive.c Sun Dec 21 02:40:36 2003 ++++ cd-drive.c Tue Dec 30 12:46:59 2003 @@ -693,28 +693,133 @@ #endif /* __linux__ */ @@ -32,49 +32,49 @@ + NULL, + NULL, + NULL)) { -+ rd_speed = strstr (stdout_data, "Maximum read speed:"); -+ if (rd_speed != NULL) { ++ wr_speed = strstr (stdout_data, "Maximum write speed:"); ++ if (wr_speed != NULL) { + char *tok; -+ rd_speed += strlen ("Maximum read speed:"); -+ for (tok = strtok (rd_speed, " (),\t\n"); -+ tok && strcmp (tok, "CD"); ++ wr_speed += strlen ("Maximum write speed:"); ++ for (tok = strtok (wr_speed, " (),\t\n"); ++ tok && strcmp (tok, "CD"); + tok = strtok (NULL, " (),\t\n")) {} + tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_rd_speed = atol (tok); ++ *max_wr_speed = atol (tok); + } + else { -+ rd_speed = strstr (stdout_data, "Maximum read speed in kB/s:"); -+ if (rd_speed != NULL) { ++ wr_speed = strstr (stdout_data, "Maximum write speed in kB/s:"); ++ if (wr_speed != NULL) { + char *tok; -+ rd_speed += strlen ("Maximum read speed in kB/s:"); -+ for (tok = strtok (rd_speed, " (),\t\n"); ++ wr_speed += strlen ("Maximum write speed in kB/s:"); ++ for (tok = strtok (wr_speed, " (),\t\n"); + tok && strcmp (tok, "CD"); + tok = strtok (NULL, " (),\t\n")) {} + tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_rd_speed = atol (tok); ++ *max_wr_speed = atol (tok); + } + } + -+ wr_speed = strstr (stdout_data, "Maximum write speed:"); -+ if (wr_speed != NULL) { ++ rd_speed = strstr (stdout_data, "Maximum read speed:"); ++ if (rd_speed != NULL) { + char *tok; -+ wr_speed += strlen ("Maximum write speed:"); -+ for (tok = strtok (wr_speed, " (),\t\n"); -+ tok && strcmp (tok, "CD"); ++ rd_speed += strlen ("Maximum read speed:"); ++ for (tok = strtok (rd_speed, " (),\t\n"); ++ tok && strcmp (tok, "CD"); + tok = strtok (NULL, " (),\t\n")) {} + tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_wr_speed = atol (tok); ++ *max_rd_speed = atol (tok); + } + else { -+ wr_speed = strstr (stdout_data, "Maximum write speed in kB/s:"); -+ if (wr_speed != NULL) { ++ rd_speed = strstr (stdout_data, "Maximum read speed in kB/s:"); ++ if (rd_speed != NULL) { + char *tok; -+ wr_speed += strlen ("Maximum write speed in kB/s:"); -+ for (tok = strtok (wr_speed, " (),\t\n"); ++ rd_speed += strlen ("Maximum read speed in kB/s:"); ++ for (tok = strtok (rd_speed, " (),\t\n"); + tok && strcmp (tok, "CD"); + tok = strtok (NULL, " (),\t\n")) {} + tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_wr_speed = atol (tok); ++ *max_rd_speed = atol (tok); + } + } + drive_cap = strstr (stdout_data, "Does write DVD-RAM media"); |