wok-next view cdrkit/stuff/cdrkit-1.1.9-glibc-2.10.patch @ rev 9540
Add setuptools to python-webhelpers build depends.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Fri Apr 08 13:50:22 2011 +0000 (2011-04-08) |
| parents | |
| children |
line source
1 diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h
2 --- cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.000000000 +0100
3 +++ cdrkit-1.1.9/include/schily.h 2009-03-11 20:31:53.000000000 +0100
4 @@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *,
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 f_execve(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 @@ -190,7 +190,7 @@ extern int schily_error(const char *, ..
14 extern char *fillbytes(void *, int, char);
15 extern char *findbytes(const void *, int, char);
16 extern int findline(const char *, char, const char *, int, char **, int);
17 -extern int getline(char *, int);
18 +extern int get_line(char *, int);
19 extern int getstr(char *, int);
20 extern int breakline(char *, char, char **, int);
21 extern int getallargs(int *, char * const**, const char *, ...);
22 diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c
23 --- cdrkit-1.1.9.orig/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100
24 +++ cdrkit-1.1.9/librols/fexec.c 2009-03-11 20:31:53.000000000 +0100
25 @@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist)
26 } while (p != NULL);
27 va_end(args);
29 - ret = fexecve(name, in, out, err, av, env);
30 + ret = f_execve(name, in, out, err, av, env);
31 if (av != xav)
32 free(av);
33 return (ret);
34 @@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av)
35 char *av[];
36 {
37 av[ac] = NULL; /* force list to be null terminated */
38 - return (fexecve(name, in, out, err, av, environ));
39 + return (f_execve(name, in, out, err, av, environ));
40 }
42 EXPORT int
43 -fexecve(name, in, out, err, av, env)
44 +f_execve(name, in, out, err, av, env)
45 const char *name;
46 FILE *in, *out, *err;
47 char * const av[], * const env[];
48 diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c
49 --- cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200
50 +++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-03-11 20:31:53.000000000 +0100
51 @@ -76,7 +76,7 @@ fgetline(f, buf, len)
52 }
54 EXPORT int
55 -getline(buf, len)
56 +get_line(buf, len)
57 char *buf;
58 int len;
59 {
60 diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c
61 --- cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100
62 +++ cdrkit-1.1.9/libusal/scsitransp.c 2009-03-11 20:31:53.000000000 +0100
63 @@ -301,7 +301,7 @@ usal_yes(char *msg)
65 printf("%s", msg);
66 flush();
67 - if (getline(okbuf, sizeof (okbuf)) == EOF)
68 + if (get_line(okbuf, sizeof (okbuf)) == EOF)
69 exit(EX_BAD);
70 if (streql(okbuf, "y") || streql(okbuf, "yes") ||
71 streql(okbuf, "Y") || streql(okbuf, "YES"))
72 diff -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c
73 --- cdrkit-1.1.9.orig/readom/io.c 2006-12-08 14:38:43.000000000 +0100
74 +++ cdrkit-1.1.9/readom/io.c 2009-03-11 20:31:53.000000000 +0100
75 @@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi
76 (*prt)(s, *lp, mini, maxi, dp);
77 flush();
78 line[0] = '\0';
79 - if (getline(line, 80) == EOF)
80 + if (get_line(line, 80) == EOF)
81 exit(EX_BAD);
83 linep = skipwhite(line);
84 @@ -178,7 +178,7 @@ again:
85 vprintf(form, args);
86 va_end(args);
87 flush();
88 - if (getline(okbuf, sizeof(okbuf)) == EOF)
89 + if (get_line(okbuf, sizeof(okbuf)) == EOF)
90 exit(EX_BAD);
91 if (okbuf[0] == '?') {
92 printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
93 diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c
94 --- cdrkit-1.1.9.orig/readom/readom.c 2007-04-03 00:43:29.000000000 +0200
95 +++ cdrkit-1.1.9/readom/readom.c 2009-03-11 20:31:53.000000000 +0100
96 @@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp,
97 fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
98 usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
99 fprintf(stderr, "Enter filename [%s]: ", defname); flush();
100 - (void) getline(filename, sizeof (filename));
101 + (void) get_line(filename, sizeof (filename));
102 }
104 if (askrange) {
105 @@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp)
106 fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
107 usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
108 fprintf(stderr, "Enter filename [%s]: ", defname); flush();
109 - (void) getline(filename, sizeof (filename));
110 + (void) get_line(filename, sizeof (filename));
111 fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
113 getlong("Enter starting sector for copy:", &addr, 0L, end-1);
114 diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c
115 --- cdrkit-1.1.9.orig/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100
116 +++ cdrkit-1.1.9/wodim/cue.c 2009-03-11 20:32:18.000000000 +0100
117 @@ -253,7 +253,7 @@ static char *skipwhite(const char *s);
118 static char *peekword(void);
119 static char *lineend(void);
120 static char *markword(char *delim);
121 -static char getdelim(void);
122 +static char get_delim(void);
123 static char *getnextitem(char *delim);
124 static char *neednextitem(char *delim);
125 static char *nextword(void);
126 @@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s
127 if (kp == NULL)
128 cueabort("Unknown filetype '%s'", word);
130 - if (getdelim() == '/') {
131 + if (get_delim() == '/') {
132 word = needitem();
133 if (*astol(++word, &secsize) != '\0')
134 cueabort("Not a number '%s'", word);
135 @@ -1128,7 +1128,7 @@ linelen--;
136 }
138 static char
139 -getdelim()
140 +get_delim()
141 {
142 return (wordendc);
143 }