diff -ur cdrkit-1.1.9-old/include/schily.h cdrkit-1.1.9/include/schily.h --- cdrkit-1.1.9-old/include/schily.h 2006-11-25 01:20:20.000000000 +0100 +++ cdrkit-1.1.9/include/schily.h 2009-05-21 02:46:02.000000000 +0200 @@ -116,13 +116,13 @@ extern int 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 fsch_evecve(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 fsch_getline(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 sch_getline(char *, int); extern int getstr(char *, int); extern int breakline(char *, char, char **, int); extern int getallargs(int *, char * const**, const char *, ...); diff -ur cdrkit-1.1.9-old/librols/CMakeLists.txt cdrkit-1.1.9/librols/CMakeLists.txt diff -ur cdrkit-1.1.9-old/librols/fexec.c cdrkit-1.1.9/librols/fexec.c --- cdrkit-1.1.9-old/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100 +++ cdrkit-1.1.9/librols/fexec.c 2009-05-21 02:46:02.000000000 +0200 @@ -170,7 +170,7 @@ } while (p != NULL); va_end(args); - ret = fexecve(name, in, out, err, av, env); + ret = fsch_evecve(name, in, out, err, av, env); if (av != xav) free(av); return (ret); @@ -184,11 +184,11 @@ char *av[]; { av[ac] = NULL; /* force list to be null terminated */ - return (fexecve(name, in, out, err, av, environ)); + return (fsch_evecve(name, in, out, err, av, environ)); } EXPORT int -fexecve(name, in, out, err, av, env) +fsch_evecve(name, in, out, err, av, env) const char *name; FILE *in, *out, *err; char * const av[], * const env[]; @@ -296,13 +296,13 @@ #else if (strchr(name, '/')) { #endif - ret = execve(name, av, env); + ret = sch_evecve(name, av, env); } else if ((path = getpath(env)) == NULL) { - ret = execve(name, av, env); + ret = sch_evecve(name, av, env); if ((geterrno() == ENOENT) && strlen(name) <= (sizeof (nbuf) - 6)) { strcatl(nbuf, "/bin/", name, (char *)NULL); - ret = execve(nbuf, av, env); + ret = sch_evecve(nbuf, av, env); } } else { int nlen = strlen(name); @@ -319,7 +319,7 @@ strcatl(nbuf, name, (char *)NULL); else strcatl(nbuf, nbuf, "/", name, (char *)NULL); - ret = execve(nbuf, av, env); + ret = sch_evecve(nbuf, av, env); if (geterrno() != ENOENT || *path == '\0') break; path++; diff -ur cdrkit-1.1.9-old/librols/getdomainname.c cdrkit-1.1.9/librols/getdomainname.c --- cdrkit-1.1.9-old/librols/getdomainname.c 2006-12-08 14:38:43.000000000 +0100 +++ cdrkit-1.1.9/librols/getdomainname.c 2009-05-21 02:46:02.000000000 +0200 @@ -83,7 +83,7 @@ if (f == NULL) return (-1); - while (fgetline(f, name1, sizeof (name1)) >= 0) { + while (fsch_getline(f, name1, sizeof (name1)) >= 0) { if ((p = strchr(name1, '#')) != NULL) *p = '\0'; diff -ur cdrkit-1.1.9-old/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c --- cdrkit-1.1.9-old/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200 +++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-05-21 02:46:02.000000000 +0200 @@ -37,7 +37,7 @@ */ EXPORT int -fgetline(f, buf, len) +fsch_getline(f, buf, len) register FILE *f; char *buf; register int len; @@ -76,9 +76,9 @@ } EXPORT int -getline(buf, len) +sch_getline(buf, len) char *buf; int len; { - return (fgetline(stdin, buf, len)); + return (fsch_getline(stdin, buf, len)); } diff -ur cdrkit-1.1.9-old/libusal/scsi-remote.c cdrkit-1.1.9/libusal/scsi-remote.c diff -ur cdrkit-1.1.9-old/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c --- cdrkit-1.1.9-old/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100 +++ cdrkit-1.1.9/libusal/scsitransp.c 2009-05-21 02:46:03.000000000 +0200 @@ -301,7 +301,7 @@ printf("%s", msg); flush(); - if (getline(okbuf, sizeof (okbuf)) == EOF) + if (sch_getline(okbuf, sizeof (okbuf)) == EOF) exit(EX_BAD); if (streql(okbuf, "y") || streql(okbuf, "yes") || streql(okbuf, "Y") || streql(okbuf, "YES")) diff -ur cdrkit-1.1.9-old/misc/shared_lib_patch_incomplete.diff cdrkit-1.1.9/misc/shared_lib_patch_incomplete.diff diff -ur cdrkit-1.1.9-old/readom/io.c cdrkit-1.1.9/readom/io.c --- cdrkit-1.1.9-old/readom/io.c 2006-12-08 14:38:43.000000000 +0100 +++ cdrkit-1.1.9/readom/io.c 2009-05-21 02:46:04.000000000 +0200 @@ -130,7 +130,7 @@ (*prt)(s, *lp, mini, maxi, dp); flush(); line[0] = '\0'; - if (getline(line, 80) == EOF) + if (sch_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 (sch_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"); diff -ur cdrkit-1.1.9-old/readom/readom.c cdrkit-1.1.9/readom/readom.c --- cdrkit-1.1.9-old/readom/readom.c 2007-04-03 00:43:29.000000000 +0200 +++ cdrkit-1.1.9/readom/readom.c 2009-05-21 02:46:04.000000000 +0200 @@ -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) sch_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) sch_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); diff -ur cdrkit-1.1.9-old/wodim/cue.c cdrkit-1.1.9/wodim/cue.c --- cdrkit-1.1.9-old/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100 +++ cdrkit-1.1.9/wodim/cue.c 2009-05-21 02:46:03.000000000 +0200 @@ -253,7 +253,7 @@ static char *peekword(void); static char *lineend(void); static char *markword(char *delim); -static char getdelim(void); +static char sch_getdelim(void); static char *getnextitem(char *delim); static char *neednextitem(char *delim); static char *nextword(void); @@ -746,7 +746,7 @@ if (kp == NULL) cueabort("Unknown filetype '%s'", word); - if (getdelim() == '/') { + if (sch_getdelim() == '/') { word = needitem(); if (*astol(++word, &secsize) != '\0') cueabort("Not a number '%s'", word); @@ -1038,7 +1038,7 @@ do { fillbytes(linebuf, sizeof (linebuf), '\0'); - len = fgetline(f, linebuf, sizeof (linebuf)); + len = fsch_getline(f, linebuf, sizeof (linebuf)); if (len < 0) return (NULL); if (len > 0 && linebuf[len-1] == '\r') { @@ -1128,7 +1128,7 @@ } static char -getdelim() +sch_getdelim() { return (wordendc); } diff -ur cdrkit-1.1.9-old/wodim/wodim.c cdrkit-1.1.9/wodim/wodim.c --- cdrkit-1.1.9-old/wodim/wodim.c 2008-02-26 08:59:05.000000000 +0100 +++ cdrkit-1.1.9/wodim/wodim.c 2009-05-21 02:46:02.000000000 +0200 @@ -3964,7 +3964,7 @@ #endif } else #endif - if (fgetline(tty, ans, 1) < 0) + if (fsch_getline(tty, ans, 1) < 0) comerrno(EX_BAD, "Aborted by EOF on input.\n"); } usalp->silent--;