wok-stable diff cdrkit/stuff/cdrkit-1.1.9-glibc-2.10.patch @ rev 11309
tinyproxy: Fixed patch.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sun Nov 13 02:13:59 2011 +0000 (2011-11-13) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/cdrkit/stuff/cdrkit-1.1.9-glibc-2.10.patch Sun Nov 13 02:13:59 2011 +0000 1.3 @@ -0,0 +1,143 @@ 1.4 +diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h 1.5 +--- cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.000000000 +0100 1.6 ++++ cdrkit-1.1.9/include/schily.h 2009-03-11 20:31:53.000000000 +0100 1.7 +@@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *, 1.8 + extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); 1.9 + /* 6th arg not const, fexecv forces av[ac] = NULL */ 1.10 + extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **); 1.11 +-extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *, 1.12 ++extern int f_execve(const char *, FILE *, FILE *, FILE *, char * const *, 1.13 + char * const *); 1.14 + extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *); 1.15 + extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...); 1.16 +@@ -190,7 +190,7 @@ extern int schily_error(const char *, .. 1.17 + extern char *fillbytes(void *, int, char); 1.18 + extern char *findbytes(const void *, int, char); 1.19 + extern int findline(const char *, char, const char *, int, char **, int); 1.20 +-extern int getline(char *, int); 1.21 ++extern int get_line(char *, int); 1.22 + extern int getstr(char *, int); 1.23 + extern int breakline(char *, char, char **, int); 1.24 + extern int getallargs(int *, char * const**, const char *, ...); 1.25 +diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c 1.26 +--- cdrkit-1.1.9.orig/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100 1.27 ++++ cdrkit-1.1.9/librols/fexec.c 2009-03-11 20:31:53.000000000 +0100 1.28 +@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist) 1.29 + } while (p != NULL); 1.30 + va_end(args); 1.31 + 1.32 +- ret = fexecve(name, in, out, err, av, env); 1.33 ++ ret = f_execve(name, in, out, err, av, env); 1.34 + if (av != xav) 1.35 + free(av); 1.36 + return (ret); 1.37 +@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av) 1.38 + char *av[]; 1.39 + { 1.40 + av[ac] = NULL; /* force list to be null terminated */ 1.41 +- return (fexecve(name, in, out, err, av, environ)); 1.42 ++ return (f_execve(name, in, out, err, av, environ)); 1.43 + } 1.44 + 1.45 + EXPORT int 1.46 +-fexecve(name, in, out, err, av, env) 1.47 ++f_execve(name, in, out, err, av, env) 1.48 + const char *name; 1.49 + FILE *in, *out, *err; 1.50 + char * const av[], * const env[]; 1.51 +diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c 1.52 +--- cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200 1.53 ++++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-03-11 20:31:53.000000000 +0100 1.54 +@@ -76,7 +76,7 @@ fgetline(f, buf, len) 1.55 + } 1.56 + 1.57 + EXPORT int 1.58 +-getline(buf, len) 1.59 ++get_line(buf, len) 1.60 + char *buf; 1.61 + int len; 1.62 + { 1.63 +diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c 1.64 +--- cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100 1.65 ++++ cdrkit-1.1.9/libusal/scsitransp.c 2009-03-11 20:31:53.000000000 +0100 1.66 +@@ -301,7 +301,7 @@ usal_yes(char *msg) 1.67 + 1.68 + printf("%s", msg); 1.69 + flush(); 1.70 +- if (getline(okbuf, sizeof (okbuf)) == EOF) 1.71 ++ if (get_line(okbuf, sizeof (okbuf)) == EOF) 1.72 + exit(EX_BAD); 1.73 + if (streql(okbuf, "y") || streql(okbuf, "yes") || 1.74 + streql(okbuf, "Y") || streql(okbuf, "YES")) 1.75 +diff -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c 1.76 +--- cdrkit-1.1.9.orig/readom/io.c 2006-12-08 14:38:43.000000000 +0100 1.77 ++++ cdrkit-1.1.9/readom/io.c 2009-03-11 20:31:53.000000000 +0100 1.78 +@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi 1.79 + (*prt)(s, *lp, mini, maxi, dp); 1.80 + flush(); 1.81 + line[0] = '\0'; 1.82 +- if (getline(line, 80) == EOF) 1.83 ++ if (get_line(line, 80) == EOF) 1.84 + exit(EX_BAD); 1.85 + 1.86 + linep = skipwhite(line); 1.87 +@@ -178,7 +178,7 @@ again: 1.88 + vprintf(form, args); 1.89 + va_end(args); 1.90 + flush(); 1.91 +- if (getline(okbuf, sizeof(okbuf)) == EOF) 1.92 ++ if (get_line(okbuf, sizeof(okbuf)) == EOF) 1.93 + exit(EX_BAD); 1.94 + if (okbuf[0] == '?') { 1.95 + printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n"); 1.96 +diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c 1.97 +--- cdrkit-1.1.9.orig/readom/readom.c 2007-04-03 00:43:29.000000000 +0200 1.98 ++++ cdrkit-1.1.9/readom/readom.c 2009-03-11 20:31:53.000000000 +0100 1.99 +@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp, 1.100 + fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n", 1.101 + usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); 1.102 + fprintf(stderr, "Enter filename [%s]: ", defname); flush(); 1.103 +- (void) getline(filename, sizeof (filename)); 1.104 ++ (void) get_line(filename, sizeof (filename)); 1.105 + } 1.106 + 1.107 + if (askrange) { 1.108 +@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp) 1.109 + fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n", 1.110 + usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); 1.111 + fprintf(stderr, "Enter filename [%s]: ", defname); flush(); 1.112 +- (void) getline(filename, sizeof (filename)); 1.113 ++ (void) get_line(filename, sizeof (filename)); 1.114 + fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n"); 1.115 + 1.116 + getlong("Enter starting sector for copy:", &addr, 0L, end-1); 1.117 +diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c 1.118 +--- cdrkit-1.1.9.orig/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100 1.119 ++++ cdrkit-1.1.9/wodim/cue.c 2009-03-11 20:32:18.000000000 +0100 1.120 +@@ -253,7 +253,7 @@ static char *skipwhite(const char *s); 1.121 + static char *peekword(void); 1.122 + static char *lineend(void); 1.123 + static char *markword(char *delim); 1.124 +-static char getdelim(void); 1.125 ++static char get_delim(void); 1.126 + static char *getnextitem(char *delim); 1.127 + static char *neednextitem(char *delim); 1.128 + static char *nextword(void); 1.129 +@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s 1.130 + if (kp == NULL) 1.131 + cueabort("Unknown filetype '%s'", word); 1.132 + 1.133 +- if (getdelim() == '/') { 1.134 ++ if (get_delim() == '/') { 1.135 + word = needitem(); 1.136 + if (*astol(++word, &secsize) != '\0') 1.137 + cueabort("Not a number '%s'", word); 1.138 +@@ -1128,7 +1128,7 @@ linelen--; 1.139 + } 1.140 + 1.141 + static char 1.142 +-getdelim() 1.143 ++get_delim() 1.144 + { 1.145 + return (wordendc); 1.146 + }