1 diff -puNr cdrdao-1.2.2.orig/scsilib/include/schily.h cdrdao-1.2.2/scsilib/include/schily.h
2 --- cdrdao-1.2.2.orig/scsilib/include/schily.h 2004-03-05 01:30:40.000000000 +0100
3 +++ cdrdao-1.2.2/scsilib/include/schily.h 2009-03-11 21:55:15.000000000 +0100
4 @@ -108,7 +108,7 @@ extern int fexecle __PR((const char *, F
5 /* 6th arg not const, fexecv forces av[ac] = NULL */
6 extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
8 -extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
9 +extern int f_execve __PR((const char *, FILE *, FILE *, FILE *,
10 char * const *, char * const *));
11 extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
12 extern int fspawnl __PR((FILE *, FILE *, FILE *,
13 @@ -187,7 +187,7 @@ extern char *fillbytes __PR((void *, int
14 extern char *findbytes __PR((const void *, int, char));
15 extern int findline __PR((const char *, char, const char *,
17 -extern int getline __PR((char *, int));
18 +extern int get_line __PR((char *, int));
19 extern int getstr __PR((char *, int));
20 extern int breakline __PR((char *, char, char **, int));
21 extern int getallargs __PR((int *, char * const**, const char *, ...));
22 diff -puNr cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c cdrdao-1.2.2/scsilib/libscg/scsitransp.c
23 --- cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c 2004-06-17 22:20:27.000000000 +0200
24 +++ cdrdao-1.2.2/scsilib/libscg/scsitransp.c 2009-03-11 21:54:24.000000000 +0100
25 @@ -323,7 +323,7 @@ scg_yes(msg)
29 - if (getline(okbuf, sizeof (okbuf)) == EOF)
30 + if (get_line(okbuf, sizeof (okbuf)) == EOF)
32 if (streql(okbuf, "y") || streql(okbuf, "yes") ||
33 streql(okbuf, "Y") || streql(okbuf, "YES"))
34 diff -puNr cdrdao-1.2.2.orig/scsilib/libschily/fexec.c cdrdao-1.2.2/scsilib/libschily/fexec.c
35 --- cdrdao-1.2.2.orig/scsilib/libschily/fexec.c 2004-06-06 13:50:24.000000000 +0200
36 +++ cdrdao-1.2.2/scsilib/libschily/fexec.c 2009-03-11 21:55:06.000000000 +0100
37 @@ -159,7 +159,7 @@ fexecle(name, in, out, err, va_alist)
41 - ret = fexecve(name, in, out, err, av, env);
42 + ret = f_execve(name, in, out, err, av, env);
46 @@ -173,11 +173,11 @@ fexecv(name, in, out, err, ac, av)
49 av[ac] = NULL; /* force list to be null terminated */
50 - return (fexecve(name, in, out, err, av, environ));
51 + return (f_execve(name, in, out, err, av, environ));
55 -fexecve(name, in, out, err, av, env)
56 +f_execve(name, in, out, err, av, env)
59 char * const av[], * const env[];
60 diff -puNr cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c
61 --- cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c 2004-08-08 13:02:05.000000000 +0200
62 +++ cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c 2009-03-11 21:54:04.000000000 +0100
63 @@ -64,7 +64,7 @@ fgetline(f, buf, len)