1
Index: cdrdao-1.2.2/scsilib/include/schily.h
2
===================================================================
3
--- cdrdao-1.2.2.orig/scsilib/include/schily.h 2004-03-05 01:30:40.000000000 +0100
4
+++ cdrdao-1.2.2/scsilib/include/schily.h 2009-10-03 14:34:42.000000000 +0200
6
/* 6th arg not const, fexecv forces av[ac] = NULL */
7
extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
9
-extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
10
+extern int fexecve_schily __PR((const char *, FILE *, FILE *, FILE *,
11
char * const *, char * const *));
12
extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
13
extern int fspawnl __PR((FILE *, FILE *, FILE *,
15
extern char *findbytes __PR((const void *, int, char));
16
extern int findline __PR((const char *, char, const char *,
18
-extern int getline __PR((char *, int));
19
+extern int getline_schily __PR((char *, int));
20
extern int getstr __PR((char *, int));
21
extern int breakline __PR((char *, char, char **, int));
22
extern int getallargs __PR((int *, char * const**, const char *, ...));
23
Index: cdrdao-1.2.2/scsilib/libscg/scsitransp.c
24
===================================================================
25
--- cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c 2009-10-03 14:33:09.000000000 +0200
26
+++ cdrdao-1.2.2/scsilib/libscg/scsitransp.c 2009-10-03 14:33:09.000000000 +0200
31
- if (getline(okbuf, sizeof (okbuf)) == EOF)
32
+ if (getline_schily(okbuf, sizeof (okbuf)) == EOF)
34
if (streql(okbuf, "y") || streql(okbuf, "yes") ||
35
streql(okbuf, "Y") || streql(okbuf, "YES"))
36
Index: cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c
37
===================================================================
38
--- cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c 2004-08-08 13:02:05.000000000 +0200
39
+++ cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c 2009-10-03 14:33:09.000000000 +0200
45
+getline_schily(buf, len)
49
Index: cdrdao-1.2.2/scsilib/libschily/fexec.c
50
===================================================================
51
--- cdrdao-1.2.2.orig/scsilib/libschily/fexec.c 2009-10-03 14:35:26.000000000 +0200
52
+++ cdrdao-1.2.2/scsilib/libschily/fexec.c 2009-10-03 14:35:08.000000000 +0200
57
- ret = fexecve(name, in, out, err, av, env);
58
+ ret = fexecve_schily(name, in, out, err, av, env);
65
av[ac] = NULL; /* force list to be null terminated */
66
- return (fexecve(name, in, out, err, av, environ));
67
+ return (fexecve_schily(name, in, out, err, av, environ));
71
-fexecve(name, in, out, err, av, env)
72
+fexecve_schily(name, in, out, err, av, env)
75
char * const av[], * const env[];