?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fix typo that causes a failure to update the common directory. (releng
[cdrkit.git] / cdrkit-1.1.9-types.patch
blobd25b6f3f079d5c664f653c4813903407f889526f
1 diff -urN cdrkit-1.1.9/include/schily.h cdrkit-1.1.9_getline/include/schily.h
2 --- cdrkit-1.1.9/include/schily.h 2009-06-08 13:22:27.000000000 +0200
3 +++ cdrkit-1.1.9_getline/include/schily.h 2009-06-08 13:46:40.000000000 +0200
4 @@ -116,13 +116,13 @@
5 extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...);
6 /* 6th arg not const, fexecv forces av[ac] = NULL */
7 extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **);
8 -extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *,
9 +extern int cdr_fexecve(const char *, FILE *, FILE *, FILE *, char * const *,
10 char * const *);
11 extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *);
12 extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...);
13 extern int fspawnv_nowait(FILE *, FILE *, FILE *, const char *, int,
14 char *const*);
15 -extern int fgetline(FILE *, char *, int);
16 +extern int cdr_fgetline(FILE *, char *, int);
17 extern int fgetstr(FILE *, char *, int);
18 extern void file_raise(FILE *, int);
19 extern int fileclose(FILE *);
20 @@ -190,7 +190,7 @@
21 extern char *fillbytes(void *, int, char);
22 extern char *findbytes(const void *, int, char);
23 extern int findline(const char *, char, const char *, int, char **, int);
24 -extern int getline(char *, int);
25 +extern int cdr_getline(char *, int);
26 extern int getstr(char *, int);
27 extern int breakline(char *, char, char **, int);
28 extern int getallargs(int *, char * const**, const char *, ...);
29 diff -urN cdrkit-1.1.9/librols/fexec.c cdrkit-1.1.9_getline/librols/fexec.c
30 --- cdrkit-1.1.9/librols/fexec.c 2009-06-08 13:22:27.000000000 +0200
31 +++ cdrkit-1.1.9_getline/librols/fexec.c 2009-06-08 13:46:33.000000000 +0200
32 @@ -170,7 +170,7 @@
33 } while (p != NULL);
34 va_end(args);
35
36 - ret = fexecve(name, in, out, err, av, env);
37 + ret = cdr_fexecve(name, in, out, err, av, env);
38 if (av != xav)
39 free(av);
40 return (ret);
41 @@ -184,11 +184,11 @@
42 char *av[];
43 {
44 av[ac] = NULL; /* force list to be null terminated */
45 - return (fexecve(name, in, out, err, av, environ));
46 + return (cdr_fexecve(name, in, out, err, av, environ));
47 }
48
49 EXPORT int
50 -fexecve(name, in, out, err, av, env)
51 +cdr_fexecve(name, in, out, err, av, env)
52 const char *name;
53 FILE *in, *out, *err;
54 char * const av[], * const env[];
55 diff -urN cdrkit-1.1.9/librols/getdomainname.c cdrkit-1.1.9_getline/librols/getdomainname.c
56 --- cdrkit-1.1.9/librols/getdomainname.c 2009-06-08 13:22:27.000000000 +0200
57 +++ cdrkit-1.1.9_getline/librols/getdomainname.c 2009-06-08 13:32:40.000000000 +0200
58 @@ -83,7 +83,7 @@
59 if (f == NULL)
60 return (-1);
61
62 - while (fgetline(f, name1, sizeof (name1)) >= 0) {
63 + while (cdr_fgetline(f, name1, sizeof (name1)) >= 0) {
64 if ((p = strchr(name1, '#')) != NULL)
65 *p = '\0';
66
67 diff -urN cdrkit-1.1.9/librols/stdio/fgetline.c cdrkit-1.1.9_getline/librols/stdio/fgetline.c
68 --- cdrkit-1.1.9/librols/stdio/fgetline.c 2009-06-08 13:22:27.000000000 +0200
69 +++ cdrkit-1.1.9_getline/librols/stdio/fgetline.c 2009-06-08 13:32:19.000000000 +0200
70 @@ -37,7 +37,7 @@
71 */
72
73 EXPORT int
74 -fgetline(f, buf, len)
75 +cdr_fgetline(f, buf, len)
76 register FILE *f;
77 char *buf;
78 register int len;
79 @@ -76,9 +76,9 @@
80 }
81
82 EXPORT int
83 -getline(buf, len)
84 +cdr_getline(buf, len)
85 char *buf;
86 int len;
87 {
88 - return (fgetline(stdin, buf, len));
89 + return (cdr_fgetline(stdin, buf, len));
90 }
91 diff -urN cdrkit-1.1.9/libusal/scsitransp.c cdrkit-1.1.9_getline/libusal/scsitransp.c
92 --- cdrkit-1.1.9/libusal/scsitransp.c 2009-06-08 13:22:27.000000000 +0200
93 +++ cdrkit-1.1.9_getline/libusal/scsitransp.c 2009-06-08 13:32:01.000000000 +0200
94 @@ -301,7 +301,7 @@
95
96 printf("%s", msg);
97 flush();
98 - if (getline(okbuf, sizeof (okbuf)) == EOF)
99 + if (cdr_getline(okbuf, sizeof (okbuf)) == EOF)
100 exit(EX_BAD);
101 if (streql(okbuf, "y") || streql(okbuf, "yes") ||
102 streql(okbuf, "Y") || streql(okbuf, "YES"))
103 diff -urN cdrkit-1.1.9/readom/io.c cdrkit-1.1.9_getline/readom/io.c
104 --- cdrkit-1.1.9/readom/io.c 2009-06-08 13:22:27.000000000 +0200
105 +++ cdrkit-1.1.9_getline/readom/io.c 2009-06-08 13:31:39.000000000 +0200
106 @@ -130,7 +130,7 @@
107 (*prt)(s, *lp, mini, maxi, dp);
108 flush();
109 line[0] = '\0';
110 - if (getline(line, 80) == EOF)
111 + if (cdr_getline(line, 80) == EOF)
112 exit(EX_BAD);
113
114 linep = skipwhite(line);
115 @@ -178,7 +178,7 @@
116 vprintf(form, args);
117 va_end(args);
118 flush();
119 - if (getline(okbuf, sizeof(okbuf)) == EOF)
120 + if (cdr_getline(okbuf, sizeof(okbuf)) == EOF)
121 exit(EX_BAD);
122 if (okbuf[0] == '?') {
123 printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
124 diff -urN cdrkit-1.1.9/readom/readom.c cdrkit-1.1.9_getline/readom/readom.c
125 --- cdrkit-1.1.9/readom/readom.c 2009-06-08 13:22:27.000000000 +0200
126 +++ cdrkit-1.1.9_getline/readom/readom.c 2009-06-08 13:31:54.000000000 +0200
127 @@ -1605,7 +1605,7 @@
128 fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
129 usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
130 fprintf(stderr, "Enter filename [%s]: ", defname); flush();
131 - (void) getline(filename, sizeof (filename));
132 + (void) cdr_getline(filename, sizeof (filename));
133 }
134
135 if (askrange) {
136 @@ -1772,7 +1772,7 @@
137 fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
138 usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
139 fprintf(stderr, "Enter filename [%s]: ", defname); flush();
140 - (void) getline(filename, sizeof (filename));
141 + (void) cdr_getline(filename, sizeof (filename));
142 fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
143
144 getlong("Enter starting sector for copy:", &addr, 0L, end-1);
145 diff -urN cdrkit-1.1.9/wodim/cue.c cdrkit-1.1.9_getline/wodim/cue.c
146 --- cdrkit-1.1.9/wodim/cue.c 2009-06-08 13:22:27.000000000 +0200
147 +++ cdrkit-1.1.9_getline/wodim/cue.c 2009-06-08 13:58:59.000000000 +0200
148 @@ -253,7 +253,7 @@
149 static char *peekword(void);
150 static char *lineend(void);
151 static char *markword(char *delim);
152 -static char getdelim(void);
153 +static char cdr_getdelim(void);
154 static char *getnextitem(char *delim);
155 static char *neednextitem(char *delim);
156 static char *nextword(void);
157 @@ -746,7 +746,7 @@
158 if (kp == NULL)
159 cueabort("Unknown filetype '%s'", word);
160
161 - if (getdelim() == '/') {
162 + if (cdr_getdelim() == '/') {
163 word = needitem();
164 if (*astol(++word, &secsize) != '\0')
165 cueabort("Not a number '%s'", word);
166 @@ -1038,7 +1038,7 @@
167
168 do {
169 fillbytes(linebuf, sizeof (linebuf), '\0');
170 - len = fgetline(f, linebuf, sizeof (linebuf));
171 + len = cdr_fgetline(f, linebuf, sizeof (linebuf));
172 if (len < 0)
173 return (NULL);
174 if (len > 0 && linebuf[len-1] == '\r') {
175 @@ -1128,7 +1128,7 @@
176 }
177
178 static char
179 -getdelim()
180 +cdr_getdelim()
181 {
182 return (wordendc);
183 }
184 diff -urN cdrkit-1.1.9/wodim/wodim.c cdrkit-1.1.9_getline/wodim/wodim.c
185 --- cdrkit-1.1.9/wodim/wodim.c 2009-06-08 13:22:27.000000000 +0200
186 +++ cdrkit-1.1.9_getline/wodim/wodim.c 2009-06-08 13:33:01.000000000 +0200
187 @@ -3964,7 +3964,7 @@
188 #endif
189 } else
190 #endif
191 - if (fgetline(tty, ans, 1) < 0)
192 + if (cdr_fgetline(tty, ans, 1) < 0)
193 comerrno(EX_BAD, "Aborted by EOF on input.\n");
194 }
195 usalp->silent--;