]> git.pld-linux.org Git - packages/cdrtools.git/blame - cdrtools-rename.patch
projects / packages / cdrtools.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to a72
[packages/cdrtools.git] / cdrtools-rename.patch
CommitLineData
3c23a3b4 1--- cdrtools-2.01.01.orig/autoconf/configure.in 2009-12-31 16:15:52.000000000 +0100
2+++ cdrtools-2.01.01/autoconf/configure.in 2010-01-06 09:38:12.000000000 +0100
3@@ -354,13 +354,13 @@
4 dnl fexecve() that returns ENOSYS an AC_CHECK_FUNCS() would return FALSE
5 dnl
6 echo Checking for POSIX violations by the POSIX.1-2008 standard:
7-AC_RCHECK_FUNCS(fexecl fexecle fexecv fexecve)
8-AC_RCHECK_FUNCS(fspawnv fspawnl fspawnv_nowait)
9+AC_CHECK_FUNCS(fexecl fexecle fexecv fexecve)
10+AC_CHECK_FUNCS(fspawnv fspawnl fspawnv_nowait)
11
12 dnl A similar problem exists with the new POSIX.1-2008 interfaces
13 dnl getline() and fgetline(). These interfaces are also incompatible
14 dnl with our interfaces defined in 1982.
15-AC_RCHECK_FUNCS(getline fgetline)
16+AC_CHECK_FUNCS(getline fgetline)
17 echo End of tests for POSIX violations by the POSIX.1-2008 standard.
18
19 dnl Check whether a symbol is either defined in an include file or
20--- cdrtools-2.01.01/include/schily/schily.h.orig 2010-01-06 08:17:45.000000000 +0100
21+++ cdrtools-2.01.01/include/schily/schily.h 2010-01-06 08:19:08.000000000 +0100
22@@ -144,7 +144,6 @@
23 #define fexecl js_fexecl
24 #define fexecle js_fexecle
25 #define fexecv js_fexecv
26-#define fexecve js_fexecve
27 #endif
28 #ifdef RENAME_FSPAWN
29 #define fspawnv js_fspawnv
30@@ -152,7 +151,6 @@
31 #define fspawnl js_fspawnl
32 #endif
33 #ifdef RENAME_GETLINE
34-#define getline js_getline
35 #define fgetline js_fgetline
36 #endif
37
38@@ -174,7 +172,7 @@
39 /* 6th arg not const, fexecv forces av[ac] = NULL */
40 extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
41 char **));
42-extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
43+extern int js_fexecve __PR((const char *, FILE *, FILE *, FILE *,
44 char * const *, char * const *));
45 extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
46 extern int fspawnl __PR((FILE *, FILE *, FILE *, const char *, ...));
47@@ -311,7 +309,7 @@
48 extern char *findinpath __PR((char *__name, int __mode, BOOL __plain_file));
49 extern int findline __PR((const char *, char, const char *,
50 int, char **, int));
51-extern int getline __PR((char *, int));
52+extern int js_getline __PR((char *, int));
53 extern int getstr __PR((char *, int));
54 extern int breakline __PR((char *, char, char **, int));
55 extern int getallargs __PR((int *, char * const**, const char *, ...));
56--- cdrtools-2.01.01/libfind/find.c.orig 2010-01-06 08:21:03.000000000 +0100
57+++ cdrtools-2.01.01/libfind/find.c 2010-01-06 08:21:50.000000000 +0100
58@@ -1747,7 +1747,7 @@
59 #endif
60 av[ac] = NULL; /* -exec {} \; is not NULL terminated */
61
62- fexecve(av[0], state->std[0], state->std[1], state->std[2],
63+ js_fexecve(av[0], state->std[0], state->std[1], state->std[2],
64 av, state->env);
65 err = geterrno();
66 #ifdef PLUS_DEBUG
67--- cdrtools-2.01.01/libscg/scsitransp.c.orig 2009-09-07 21:09:48.000000000 +0200
68+++ cdrtools-2.01.01/libscg/scsitransp.c 2010-01-06 08:37:33.000000000 +0100
69@@ -338,7 +338,7 @@
70
71 js_printf("%s", msg);
72 flush();
73- if (getline(okbuf, sizeof (okbuf)) == EOF)
74+ if (js_getline(okbuf, sizeof (okbuf)) == EOF)
75 exit(EX_BAD);
76 if (streql(okbuf, "y") || streql(okbuf, "yes") ||
77 streql(okbuf, "Y") || streql(okbuf, "YES"))
78--- cdrtools-2.01.01/libschily/fexec.c.orig 2009-11-15 15:14:28.000000000 +0100
79+++ cdrtools-2.01.01/libschily/fexec.c 2010-01-06 08:41:20.000000000 +0100
80@@ -135,7 +135,7 @@
81 } while (p != NULL);
82 va_end(args);
83
84- ret = fexecv(name, in, out, err, ac, av);
85+ ret = js_fexecv(name, in, out, err, ac, av);
86 if (av != xav)
87 free(av);
88 return (ret);
89@@ -143,10 +143,10 @@
90
91 #ifdef PROTOTYPES
92 EXPORT int
93-fexecle(const char *name, FILE *in, FILE *out, FILE *err, const char *arg0, ...)
94+js_fexecle(const char *name, FILE *in, FILE *out, FILE *err, const char *arg0, ...)
95 #else
96 EXPORT int
97-fexecle(name, in, out, err, arg0, va_alist)
98+js_fexecle(name, in, out, err, arg0, va_alist)
99 char *name;
100 FILE *in;
101 FILE *out;
102@@ -198,25 +198,25 @@
103 } while (p != NULL);
104 va_end(args);
105
106- ret = fexecve(name, in, out, err, av, env);
107+ ret = js_fexecve(name, in, out, err, av, env);
108 if (av != xav)
109 free(av);
110 return (ret);
111 }
112
113 EXPORT int
114-fexecv(name, in, out, err, ac, av)
115+js_fexecv(name, in, out, err, ac, av)
116 const char *name;
117 FILE *in, *out, *err;
118 int ac;
119 char *av[];
120 {
121 av[ac] = NULL; /* force list to be null terminated */
122- return (fexecve(name, in, out, err, av, environ));
123+ return (js_fexecve(name, in, out, err, av, environ));
124 }
125
126 EXPORT int
127-fexecve(name, in, out, err, av, env)
128+js_fexecve(name, in, out, err, av, env)
129 const char *name;
130 FILE *in, *out, *err;
131 char * const av[], * const env[];
132--- cdrtools-2.01.01/libschily/spawn.c.orig 2010-01-06 08:45:54.000000000 +0100
133+++ cdrtools-2.01.01/libschily/spawn.c 2010-01-06 08:45:43.000000000 +0100
134@@ -127,10 +127,10 @@
135 if (pid != 0)
136 return (pid);
137 /*
138- * silly: fexecv must set av[ac] = NULL
139+ * silly: js_fexecv must set av[ac] = NULL
140 * so we have to cast argv tp (char **)
141 */
142- fexecv(name, in, out, err, argc, (char **)argv);
143+ js_fexecv(name, in, out, err, argc, (char **)argv);
144 _exit(geterrno());
145 /* NOTREACHED */
146 #ifndef lint
147--- cdrtools-2.01.01/libschily/stdio/fgetline.c.orig 2004-09-25 14:23:36.000000000 +0200
148+++ cdrtools-2.01.01/libschily/stdio/fgetline.c 2010-01-06 08:34:46.000000000 +0100
149@@ -61,7 +61,7 @@
150 }
151
152 EXPORT int
153-getline(buf, len)
154+js_getline(buf, len)
155 char *buf;
156 int len;
157 {
158--- cdrtools-2.01.01/readcd/io.c.orig 2010-01-06 08:29:06.000000000 +0100
159+++ cdrtools-2.01.01/readcd/io.c 2010-01-06 08:29:31.000000000 +0100
160@@ -136,7 +136,7 @@
161 (*prt)(s, *lp, mini, maxi, dp);
162 flush();
163 line[0] = '\0';
164- if (getline(line, 80) == EOF)
165+ if (js_getline(line, 80) == EOF)
166 exit(EX_BAD);
167
168 linep = skipwhite(line);
169@@ -204,7 +204,7 @@
170 printf("%r", form, args);
171 va_end(args);
172 flush();
173- if (getline(okbuf, sizeof (okbuf)) == EOF)
174+ if (js_getline(okbuf, sizeof (okbuf)) == EOF)
175 exit(EX_BAD);
176 if (okbuf[0] == '?') {
177 printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
178--- cdrtools-2.01.01/readcd/readcd.c.orig 2010-01-06 08:27:59.000000000 +0100
179+++ cdrtools-2.01.01/readcd/readcd.c 2010-01-06 08:28:36.000000000 +0100
180@@ -2098,7 +2098,7 @@
181 error("Copy from SCSI (%d,%d,%d) disk to file\n",
182 scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
183 error("Enter filename [%s]: ", defname); flush();
184- (void) getline(filename, sizeof (filename));
185+ (void) js_getline(filename, sizeof (filename));
186 }
187
188 if (askrange) {
189@@ -2285,7 +2285,7 @@
190 error("Copy from file to SCSI (%d,%d,%d) disk\n",
191 scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
192 error("Enter filename [%s]: ", defname); flush();
193- (void) getline(filename, sizeof (filename));
194+ (void) js_getline(filename, sizeof (filename));
195 error("Notice: reading from file always starts at file offset 0.\n");
196
197 getlong("Enter starting sector for copy:", &addr, 0L, end-1);
198--- cdrtools-2.01.01/scgcheck/dmaresid.c.orig 2010-01-06 08:24:34.000000000 +0100
199+++ cdrtools-2.01.01/scgcheck/dmaresid.c 2010-01-06 08:25:01.000000000 +0100
200@@ -84,7 +84,7 @@
201 printf("Ready to start test for working DMA residual count == DMA count? Enter <CR> to continue: ");
202 fprintf(logfile, "**********> Testing for working DMA residual count == DMA count.\n");
203 flushit();
204- (void) getline(abuf, sizeof (abuf));
205+ (void) js_getline(abuf, sizeof (abuf));
206 passed = TRUE;
207 dmacnt = cnt;
208 ret = xtinquiry(scgp, 0, dmacnt);
209@@ -118,7 +118,7 @@
210
211 printf("Ready to start test for working DMA residual count == 1? Enter <CR> to continue: ");
212 flushit();
213- (void) getline(abuf, sizeof (abuf));
214+ (void) js_getline(abuf, sizeof (abuf));
215 chkprint("**********> Testing for working DMA residual count == 1.\n");
216 passed = TRUE;
217 dmacnt = cnt+1;
218@@ -147,7 +147,7 @@
219
220 printf("Ready to start test for working DMA overrun detection? Enter <CR> to continue: ");
221 flushit();
222- (void) getline(abuf, sizeof (abuf));
223+ (void) js_getline(abuf, sizeof (abuf));
224 chkprint("**********> Testing for working DMA overrun detection.\n");
225 passed = TRUE;
226 dmacnt = cnt-1;
227--- cdrtools-2.01.01/scgcheck/scgcheck.c.orig 2010-01-06 08:26:33.000000000 +0100
228+++ cdrtools-2.01.01/scgcheck/scgcheck.c 2010-01-06 08:27:29.000000000 +0100
229@@ -191,7 +191,7 @@
230 break;
231 error("Enter SCSI device name for bus scanning [%s]: ", device);
232 flushit();
233- (void) getline(device, sizeof (device));
234+ (void) js_getline(device, sizeof (device));
235 if (device[0] == '\0')
236 strcpy(device, "0,6,0");
237
238@@ -616,5 +616,5 @@
239 lbuf[0] = '\0';
240 return (0);
241 }
242- return (getline(lbuf, len));
243+ return (js_getline(lbuf, len));
244 }
245--- cdrtools-2.01.01/scgcheck/sense.c.orig 2010-01-06 08:22:58.000000000 +0100
246+++ cdrtools-2.01.01/scgcheck/sense.c 2010-01-06 08:24:02.000000000 +0100
247@@ -116,7 +116,7 @@
248
249 printf("Ready to eject tray? Enter <CR> to continue: ");
250 flushit();
251- (void) getline(abuf, sizeof(abuf));
252+ (void) js_getline(abuf, sizeof(abuf));
253 if (abuf[0] != 'n') {
254 scsi_unload(scgp, (cdr_t *)0);
255 needload = TRUE;
Highly portable CD/DVD/BluRay command line recording software
This page took 0.092373 seconds and 4 git commands to generate.