From peters at alioth.debian.org Sun Oct 11 18:26:02 2009 From: peters at alioth.debian.org (Peter Samuelson) Date: Sun, 11 Oct 2009 18:26:02 +0000 Subject: [Debburn-changes] r833 - cdrkit/trunk/wodim Message-ID: Author: peters Date: 2009-10-11 18:26:01 +0000 (Sun, 11 Oct 2009) New Revision: 833 Modified: cdrkit/trunk/wodim/cue.c Log: Eliminate a 'getdelim()' function. This clashes with recent POSIX. Modified: cdrkit/trunk/wodim/cue.c =================================================================== --- cdrkit/trunk/wodim/cue.c 2009-08-11 13:27:55 UTC (rev 832) +++ cdrkit/trunk/wodim/cue.c 2009-10-11 18:26:01 UTC (rev 833) @@ -253,7 +253,6 @@ static char *peekword(void); static char *lineend(void); static char *markword(char *delim); -static char getdelim(void); static char *getnextitem(char *delim); static char *neednextitem(char *delim); static char *nextword(void); @@ -746,7 +745,7 @@ if (kp == NULL) cueabort("Unknown filetype '%s'", word); - if (getdelim() == '/') { + if (wordendc == '/') { word = needitem(); if (*astol(++word, &secsize) != '\0') cueabort("Not a number '%s'", word); @@ -1127,12 +1126,6 @@ return (linep); } -static char -getdelim() -{ - return (wordendc); -} - static char * getnextitem(char *delim) { From peters at alioth.debian.org Sun Oct 11 18:27:59 2009 From: peters at alioth.debian.org (Peter Samuelson) Date: Sun, 11 Oct 2009 18:27:59 +0000 Subject: [Debburn-changes] r834 - cdrkit/trunk/genisoimage Message-ID: Author: peters Date: 2009-10-11 18:27:59 +0000 (Sun, 11 Oct 2009) New Revision: 834 Modified: cdrkit/trunk/genisoimage/sha256.c cdrkit/trunk/genisoimage/sha512.c Log: Correct a typo in a couple of license notices, s/GPL/LGPL/. Modified: cdrkit/trunk/genisoimage/sha256.c =================================================================== --- cdrkit/trunk/genisoimage/sha256.c 2009-10-11 18:26:01 UTC (rev 833) +++ cdrkit/trunk/genisoimage/sha256.c 2009-10-11 18:27:59 UTC (rev 834) @@ -3,7 +3,7 @@ Copyright (C) 2007 Free Software Foundation, Inc. Copied here from the GNU C Library version 2.7 on the 10 May 2009 - by Steve McIntyre <93sam at debian.org>. This code was under GPL v2.1 + by Steve McIntyre <93sam at debian.org>. This code was under LGPL v2.1 in glibc, and that license gives us the option to use and distribute the code under the terms of the GPL v2 instead. I'm taking that option. Modified: cdrkit/trunk/genisoimage/sha512.c =================================================================== --- cdrkit/trunk/genisoimage/sha512.c 2009-10-11 18:26:01 UTC (rev 833) +++ cdrkit/trunk/genisoimage/sha512.c 2009-10-11 18:27:59 UTC (rev 834) @@ -3,7 +3,7 @@ Copyright (C) 2007 Free Software Foundation, Inc. Copied here from the GNU C Library version 2.7 on the 10 May 2009 - by Steve McIntyre <93sam at debian.org>. This code was under GPL v2.1 + by Steve McIntyre <93sam at debian.org>. This code was under LGPL v2.1 in glibc, and that license gives us the option to use and distribute the code under the terms of the GPL v2 instead. I'm taking that option. From peters at alioth.debian.org Sun Oct 11 22:10:01 2009 From: peters at alioth.debian.org (Peter Samuelson) Date: Sun, 11 Oct 2009 22:10:01 +0000 Subject: [Debburn-changes] r835 - cdrkit/trunk/genisoimage Message-ID: Author: peters Date: 2009-10-11 22:10:00 +0000 (Sun, 11 Oct 2009) New Revision: 835 Modified: cdrkit/trunk/genisoimage/genisoimage.1 Log: Fix a few quote marks in genisoimage.1. Modified: cdrkit/trunk/genisoimage/genisoimage.1 =================================================================== --- cdrkit/trunk/genisoimage/genisoimage.1 2009-10-11 18:27:59 UTC (rev 834) +++ cdrkit/trunk/genisoimage/genisoimage.1 2009-10-11 22:10:00 UTC (rev 835) @@ -825,7 +825,7 @@ may match either the filename component or the full pathname. This option may be used multiple times. For example: .sp - genisoimage \-o rom \-m '*.o' \-m core \-m foobar + genisoimage \-o rom \-m \(aq*.o\(aq \-m core \-m foobar .sp would exclude all files ending in `.o', or called .IR core " or " foobar @@ -998,7 +998,7 @@ .IR stdout . This may be done with: .sp - cdblocks=` genisoimage \-print\-size \-quiet .\|.\|. ` + cdblocks=\` genisoimage \-print\-size \-quiet .\|.\|. \` .br genisoimage .\|.\|. | wodim .\|.\|. tsize=${cdblocks}s \- .TP @@ -1476,7 +1476,7 @@ may match any part of the filename. Multiple globs may be excluded. Example: .sp - genisoimage \-o rom \-hfs \-hide\-hfs '*.o' \-hide\-hfs foobar + genisoimage \-o rom \-hfs \-hide\-hfs \(aq*.o\(aq \-hide\-hfs foobar .sp would exclude all files ending in `.o' or called .I foobar @@ -1849,11 +1849,11 @@ # Example filename mapping file # # EXTN/XLate/CREATOR/TYPE/Comment -\&.tif/Raw/'8BIM'/'TIFF'/"Photoshop TIFF image" -\&.hqx/Ascii/'BnHq'/'TEXT'/"BinHex file" -\&.doc/Raw/'MSWD'/'WDBN'/"Word file" -\&.mov/Raw/'TVOD'/'MooV'/"QuickTime Movie" -*/Ascii/'ttxt'/'TEXT'/"Text file" +\&.tif/Raw/\(aq8BIM\(aq/\(aqTIFF\(aq/\(dqPhotoshop TIFF image\(dq +\&.hqx/Ascii/\(aqBnHq\(aq/\(aqTEXT\(aq/\(dqBinHex file\(dq +\&.doc/Raw/\(aqMSWD\(aq/\(aqWDBN\(aq/\(dqWord file\(dq +\&.mov/Raw/\(aqTVOD\(aq/\(aqMooV\(aq/\(dqQuickTime Movie\(dq +*/Ascii/\(aqttxt\(aq/\(aqTEXT\(aq/\(dqText file\(dq .TE .PP Where: From peters at alioth.debian.org Sun Oct 11 22:31:30 2009 From: peters at alioth.debian.org (Peter Samuelson) Date: Sun, 11 Oct 2009 22:31:30 +0000 Subject: [Debburn-changes] r836 - in cdrkit/trunk: include librols librols/stdio libusal readom wodim Message-ID: Author: peters Date: 2009-10-11 22:31:30 +0000 (Sun, 11 Oct 2009) New Revision: 836 Modified: cdrkit/trunk/include/schily.h cdrkit/trunk/librols/fexec.c cdrkit/trunk/librols/getdomainname.c cdrkit/trunk/librols/spawn.c cdrkit/trunk/librols/stdio/fgetline.c cdrkit/trunk/libusal/scsi-unixware.c cdrkit/trunk/libusal/scsitransp.c cdrkit/trunk/readom/io.c cdrkit/trunk/readom/readom.c cdrkit/trunk/wodim/cue.c cdrkit/trunk/wodim/wodim.c Log: Add a rols_ prefix to getline, fgetline, and the fexec family from librols. Prevents some more clashes with POSIX. I note that phasing out librols/stdio (and maybe more of librols) entirely would probably be better, but that is for another day. Modified: cdrkit/trunk/include/schily.h =================================================================== --- cdrkit/trunk/include/schily.h 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/include/schily.h 2009-10-11 22:31:30 UTC (rev 836) @@ -112,17 +112,17 @@ extern FILE *_fcons(FILE *, int, int); extern FILE *fdup(FILE *); extern int fdown(FILE *); -extern int fexecl(const char *, FILE *, FILE *, FILE *, const char *, ...); -extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); +extern int rols_fexecl(const char *, FILE *, FILE *, FILE *, const char *, ...); +extern int rols_fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); /* 6th arg not const, fexecv forces av[ac] = NULL */ -extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **); -extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *, +extern int rols_fexecv(const char *, FILE *, FILE *, FILE *, int, char **); +extern int rols_fexecve(const char *, FILE *, FILE *, FILE *, char * const *, char * const *); extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *); extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...); extern int fspawnv_nowait(FILE *, FILE *, FILE *, const char *, int, char *const*); -extern int fgetline(FILE *, char *, int); +extern int rols_fgetline(FILE *, char *, int); extern int fgetstr(FILE *, char *, int); extern void file_raise(FILE *, int); extern int fileclose(FILE *); @@ -190,7 +190,7 @@ extern char *fillbytes(void *, int, char); extern char *findbytes(const void *, int, char); extern int findline(const char *, char, const char *, int, char **, int); -extern int getline(char *, int); +extern int rols_getline(char *, int); extern int getstr(char *, int); extern int breakline(char *, char, char **, int); extern int getallargs(int *, char * const**, const char *, ...); Modified: cdrkit/trunk/librols/fexec.c =================================================================== --- cdrkit/trunk/librols/fexec.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/librols/fexec.c 2009-10-11 22:31:30 UTC (rev 836) @@ -34,13 +34,13 @@ #include #include #include -#define fexecl __nothing_1_ /* prototype in schily.h is wrong */ -#define fexecle __nothing_2_ /* prototype in schily.h is wrong */ +#define rols_fexecl __nothing_1_ /* prototype in schily.h is wrong */ +#define rols_fexecle __nothing_2_ /* prototype in schily.h is wrong */ #include -#undef fexecl -#undef fexecle - int fexecl __PR((const char *, FILE *, FILE *, FILE *, ...)); - int fexecle __PR((const char *, FILE *, FILE *, FILE *, ...)); +#undef rols_fexecl +#undef rols_fexecle + int rols_fexecl __PR((const char *, FILE *, FILE *, FILE *, ...)); + int rols_fexecle __PR((const char *, FILE *, FILE *, FILE *, ...)); #include #include #include @@ -66,10 +66,10 @@ #ifdef PROTOTYPES EXPORT int -fexecl(const char *name, FILE *in, FILE *out, FILE *err, ...) +rols_fexecl(const char *name, FILE *in, FILE *out, FILE *err, ...) #else EXPORT int -fexecl(name, in, out, err, va_alist) +rols_fexecl(name, in, out, err, va_alist) char *name; FILE *in; FILE *out; @@ -113,7 +113,7 @@ } while (p != NULL); va_end(args); - ret = fexecv(name, in, out, err, ac, av); + ret = rols_fexecv(name, in, out, err, ac, av); if (av != xav) free(av); return (ret); @@ -121,10 +121,10 @@ #ifdef PROTOTYPES EXPORT int -fexecle(const char *name, FILE *in, FILE *out, FILE *err, ...) +rols_fexecle(const char *name, FILE *in, FILE *out, FILE *err, ...) #else EXPORT int -fexecle(name, in, out, err, va_alist) +rols_fexecle(name, in, out, err, va_alist) char *name; FILE *in; FILE *out; @@ -170,25 +170,25 @@ } while (p != NULL); va_end(args); - ret = fexecve(name, in, out, err, av, env); + ret = rols_fexecve(name, in, out, err, av, env); if (av != xav) free(av); return (ret); } EXPORT int -fexecv(name, in, out, err, ac, av) +rols_fexecv(name, in, out, err, ac, av) const char *name; FILE *in, *out, *err; int ac; char *av[]; { av[ac] = NULL; /* force list to be null terminated */ - return (fexecve(name, in, out, err, av, environ)); + return (rols_fexecve(name, in, out, err, av, environ)); } EXPORT int -fexecve(name, in, out, err, av, env) +rols_fexecve(name, in, out, err, av, env) const char *name; FILE *in, *out, *err; char * const av[], * const env[]; Modified: cdrkit/trunk/librols/getdomainname.c =================================================================== --- cdrkit/trunk/librols/getdomainname.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/librols/getdomainname.c 2009-10-11 22:31:30 UTC (rev 836) @@ -83,7 +83,7 @@ if (f == NULL) return (-1); - while (fgetline(f, name1, sizeof (name1)) >= 0) { + while (rols_fgetline(f, name1, sizeof (name1)) >= 0) { if ((p = strchr(name1, '#')) != NULL) *p = '\0'; Modified: cdrkit/trunk/librols/spawn.c =================================================================== --- cdrkit/trunk/librols/spawn.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/librols/spawn.c 2009-10-11 22:31:30 UTC (rev 836) @@ -143,7 +143,7 @@ * silly: fexecv must set av[ac] = NULL * so we have to cast argv tp (char **) */ - fexecv(name, in, out, err, argc, (char **)argv); + rols_fexecv(name, in, out, err, argc, (char **)argv); exit(geterrno()); /* NOTREACHED */ } Modified: cdrkit/trunk/librols/stdio/fgetline.c =================================================================== --- cdrkit/trunk/librols/stdio/fgetline.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/librols/stdio/fgetline.c 2009-10-11 22:31:30 UTC (rev 836) @@ -37,7 +37,7 @@ */ EXPORT int -fgetline(f, buf, len) +rols_fgetline(f, buf, len) register FILE *f; char *buf; register int len; @@ -76,9 +76,9 @@ } EXPORT int -getline(buf, len) +rols_getline(buf, len) char *buf; int len; { - return (fgetline(stdin, buf, len)); + return (rols_fgetline(stdin, buf, len)); } Modified: cdrkit/trunk/libusal/scsi-unixware.c =================================================================== --- cdrkit/trunk/libusal/scsi-unixware.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/libusal/scsi-unixware.c 2009-10-11 22:31:30 UTC (rev 836) @@ -891,7 +891,7 @@ setuid(0); fclose(pp[0]); - (void) fexecl("/bin/sh", stdin, pp[1], stderr, + (void) rols_fexecl("/bin/sh", stdin, pp[1], stderr, "sh", "-c", cmd, (char *)0); _exit(1); } Modified: cdrkit/trunk/libusal/scsitransp.c =================================================================== --- cdrkit/trunk/libusal/scsitransp.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/libusal/scsitransp.c 2009-10-11 22:31:30 UTC (rev 836) @@ -301,7 +301,7 @@ printf("%s", msg); flush(); - if (getline(okbuf, sizeof (okbuf)) == EOF) + if (rols_getline(okbuf, sizeof (okbuf)) == EOF) exit(EX_BAD); if (streql(okbuf, "y") || streql(okbuf, "yes") || streql(okbuf, "Y") || streql(okbuf, "YES")) Modified: cdrkit/trunk/readom/io.c =================================================================== --- cdrkit/trunk/readom/io.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/readom/io.c 2009-10-11 22:31:30 UTC (rev 836) @@ -130,7 +130,7 @@ (*prt)(s, *lp, mini, maxi, dp); flush(); line[0] = '\0'; - if (getline(line, 80) == EOF) + if (rols_getline(line, 80) == EOF) exit(EX_BAD); linep = skipwhite(line); @@ -178,7 +178,7 @@ vprintf(form, args); va_end(args); flush(); - if (getline(okbuf, sizeof(okbuf)) == EOF) + if (rols_getline(okbuf, sizeof(okbuf)) == EOF) exit(EX_BAD); if (okbuf[0] == '?') { printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n"); Modified: cdrkit/trunk/readom/readom.c =================================================================== --- cdrkit/trunk/readom/readom.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/readom/readom.c 2009-10-11 22:31:30 UTC (rev 836) @@ -1605,7 +1605,7 @@ fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n", usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); fprintf(stderr, "Enter filename [%s]: ", defname); flush(); - (void) getline(filename, sizeof (filename)); + (void) rols_getline(filename, sizeof (filename)); } if (askrange) { @@ -1772,7 +1772,7 @@ fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n", usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); fprintf(stderr, "Enter filename [%s]: ", defname); flush(); - (void) getline(filename, sizeof (filename)); + (void) rols_getline(filename, sizeof (filename)); fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n"); getlong("Enter starting sector for copy:", &addr, 0L, end-1); Modified: cdrkit/trunk/wodim/cue.c =================================================================== --- cdrkit/trunk/wodim/cue.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/wodim/cue.c 2009-10-11 22:31:30 UTC (rev 836) @@ -1037,7 +1037,7 @@ do { fillbytes(linebuf, sizeof (linebuf), '\0'); - len = fgetline(f, linebuf, sizeof (linebuf)); + len = rols_fgetline(f, linebuf, sizeof (linebuf)); if (len < 0) return (NULL); if (len > 0 && linebuf[len-1] == '\r') { Modified: cdrkit/trunk/wodim/wodim.c =================================================================== --- cdrkit/trunk/wodim/wodim.c 2009-10-11 22:10:00 UTC (rev 835) +++ cdrkit/trunk/wodim/wodim.c 2009-10-11 22:31:30 UTC (rev 836) @@ -3964,7 +3964,7 @@ #endif } else #endif - if (fgetline(tty, ans, 1) < 0) + if (rols_fgetline(tty, ans, 1) < 0) comerrno(EX_BAD, "Aborted by EOF on input.\n"); } usalp->silent--; From peters at alioth.debian.org Sun Oct 11 22:37:12 2009 From: peters at alioth.debian.org (Peter Samuelson) Date: Sun, 11 Oct 2009 22:37:12 +0000 Subject: [Debburn-changes] r837 - in cdrkit/trunk: . debian Message-ID: Author: peters Date: 2009-10-11 22:37:12 +0000 (Sun, 11 Oct 2009) New Revision: 837 Modified: cdrkit/trunk/Changelog cdrkit/trunk/debian/changelog Log: Followup r833,836: document POSIX-function-renaming in Changelog files. Modified: cdrkit/trunk/Changelog =================================================================== --- cdrkit/trunk/Changelog 2009-10-11 22:31:30 UTC (rev 836) +++ cdrkit/trunk/Changelog 2009-10-11 22:37:12 UTC (rev 837) @@ -12,6 +12,10 @@ * genisoimage: fix string overflow breakage when using the -root option (https://bugzilla.redhat.com/show_bug.cgi?id=508449) + [ Peter Samuelson ] + * librols: remove or rename several functions that clash with POSIX. + Fix up callers. + -- Steve McIntyre <93sam at debian.org> Thu, 14 May 2009 00:28:48 +0100 cdrkit (1.1.9) RELEASED; urgency=low Modified: cdrkit/trunk/debian/changelog =================================================================== --- cdrkit/trunk/debian/changelog 2009-10-11 22:31:30 UTC (rev 836) +++ cdrkit/trunk/debian/changelog 2009-10-11 22:37:12 UTC (rev 837) @@ -1,3 +1,10 @@ +cdrkit (9:1.1.10-1) UNRELEASED; urgency=low + + * New upstream release. + - Several functions that clash with POSIX renamed. (Closes: #547886) + + -- Peter Samuelson Sun, 11 Oct 2009 17:34:51 -0500 + cdrkit (9:1.1.9-1) unstable; urgency=low * New upstream release with a couple of important bugfixes: