wok-current annotate cdrkit/stuff/cdrkit-1.1.9-glibc-2.10.patch @ rev 14380

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