rpms/star
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

defuzz patch

Browse Source
This commit is contained in:
Ondrej Vasik 2010-01-13 12:20:31 +00:00
parent e23d943196
commit 73e50533e6
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
star-1.5-stdioconflict.patch
View File

@ -1,7 +1,7 @@
diff -urNp star-1.5-orig/include/schily/schily.h star-1.5/include/schily/schily.h diff -urNp star-1.5.1-orig/include/schily/schily.h star-1.5.1/include/schily/schily.h
--- star-1.5-orig/include/schily/schily.h 2008-02-16 16:32:01.000000000 +0100 --- star-1.5.1-orig/include/schily/schily.h 2009-10-22 23:18:55.000000000 +0200
+++ star-1.5/include/schily/schily.h 2009-04-08 10:49:17.000000000 +0200 +++ star-1.5.1/include/schily/schily.h 2010-01-13 13:17:10.000000000 +0100
@@ -113,7 +113,7 @@ extern int fexecle __PR((const char *, F @@ -174,7 +174,7 @@ extern int fexecle __PR((const char *, F
/* 6th arg not const, fexecv forces av[ac] = NULL */ /* 6th arg not const, fexecv forces av[ac] = NULL */
extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int, extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
char **)); char **));
@ -9,9 +9,9 @@ diff -urNp star-1.5-orig/include/schily/schily.h star-1.5/include/schily/schily.
+extern int sch_fexecve __PR((const char *, FILE *, FILE *, FILE *, +extern int sch_fexecve __PR((const char *, FILE *, FILE *, FILE *,
char * const *, char * const *)); char * const *, char * const *));
extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *)); extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
extern int fspawnl __PR((FILE *, FILE *, FILE *, extern int fspawnl __PR((FILE *, FILE *, FILE *, const char *, ...));
@@ -243,7 +243,7 @@ extern char *fillbytes __PR((void *, int @@ -311,7 +311,7 @@ extern char *findbytes __PR((const void
extern char *findbytes __PR((const void *, int, char)); extern char *findinpath __PR((char *__name, int __mode, BOOL __plain_file));
extern int findline __PR((const char *, char, const char *, extern int findline __PR((const char *, char, const char *,
int, char **, int)); int, char **, int));
-extern int getline __PR((char *, int)); -extern int getline __PR((char *, int));
@ -19,10 +19,10 @@ diff -urNp star-1.5-orig/include/schily/schily.h star-1.5/include/schily/schily.
extern int getstr __PR((char *, int)); extern int getstr __PR((char *, int));
extern int breakline __PR((char *, char, char **, int)); extern int breakline __PR((char *, char, char **, int));
extern int getallargs __PR((int *, char * const**, const char *, ...)); extern int getallargs __PR((int *, char * const**, const char *, ...));
diff -urNp star-1.5-orig/lib/fexec.c star-1.5/lib/fexec.c diff -urNp star-1.5.1-orig/lib/fexec.c star-1.5.1/lib/fexec.c
--- star-1.5-orig/lib/fexec.c 2007-07-01 12:04:35.000000000 +0200 --- star-1.5.1-orig/lib/fexec.c 2009-11-15 15:14:28.000000000 +0100
+++ star-1.5/lib/fexec.c 2009-04-08 10:54:05.000000000 +0200 +++ star-1.5.1/lib/fexec.c 2010-01-13 13:17:10.000000000 +0100
@@ -165,7 +165,7 @@ fexecle(name, in, out, err, va_alist) @@ -198,7 +198,7 @@ const char **pav;
} while (p != NULL); } while (p != NULL);
va_end(args); va_end(args);
@ -31,7 +31,7 @@ diff -urNp star-1.5-orig/lib/fexec.c star-1.5/lib/fexec.c
if (av != xav) if (av != xav)
free(av); free(av);
return (ret); return (ret);
@@ -179,11 +179,11 @@ fexecv(name, in, out, err, ac, av) @@ -212,11 +212,11 @@ fexecv(name, in, out, err, ac, av)
char *av[]; char *av[];
{ {
av[ac] = NULL; /* force list to be null terminated */ av[ac] = NULL; /* force list to be null terminated */
@ -45,9 +45,9 @@ diff -urNp star-1.5-orig/lib/fexec.c star-1.5/lib/fexec.c
const char *name; const char *name;
FILE *in, *out, *err; FILE *in, *out, *err;
char * const av[], * const env[]; char * const av[], * const env[];
diff -urNp star-1.5-orig/lib/libschily-mapvers star-1.5/lib/libschily-mapvers diff -urNp star-1.5.1-orig/lib/libschily-mapvers star-1.5.1/lib/libschily-mapvers
--- star-1.5-orig/lib/libschily-mapvers 2007-10-06 15:21:55.000000000 +0200 --- star-1.5.1-orig/lib/libschily-mapvers 2007-10-06 15:21:55.000000000 +0200
+++ star-1.5/lib/libschily-mapvers 2009-04-08 10:54:21.000000000 +0200 +++ star-1.5.1/lib/libschily-mapvers 2010-01-13 13:17:10.000000000 +0100
@@ -77,7 +77,7 @@ global: @@ -77,7 +77,7 @@ global:
fexecl; fexecl;
fexecle; fexecle;
@ -66,9 +66,9 @@ diff -urNp star-1.5-orig/lib/libschily-mapvers star-1.5/lib/libschily-mapvers
getmainfp; getmainfp;
#getstr; #getstr;
#handlecond; #handlecond;
diff -urNp star-1.5-orig/lib/stdio/fgetline.c star-1.5/lib/stdio/fgetline.c diff -urNp star-1.5.1-orig/lib/stdio/fgetline.c star-1.5.1/lib/stdio/fgetline.c
--- star-1.5-orig/lib/stdio/fgetline.c 2004-09-25 14:23:36.000000000 +0200 --- star-1.5.1-orig/lib/stdio/fgetline.c 2004-09-25 14:23:36.000000000 +0200
+++ star-1.5/lib/stdio/fgetline.c 2009-04-08 10:51:39.000000000 +0200 +++ star-1.5.1/lib/stdio/fgetline.c 2010-01-13 13:17:10.000000000 +0100
@@ -61,7 +61,7 @@ fgetline(f, buf, len) @@ -61,7 +61,7 @@ fgetline(f, buf, len)
} }
@ -78,15 +78,15 @@ diff -urNp star-1.5-orig/lib/stdio/fgetline.c star-1.5/lib/stdio/fgetline.c
char *buf; char *buf;
int len; int len;
{ {
diff -urNp star-1.5-orig/libfind/find.c star-1.5/libfind/find.c diff -urNp star-1.5.1-orig/libfind/find.c star-1.5.1/libfind/find.c
--- star-1.5-orig/libfind/find.c 2008-04-10 19:04:54.000000000 +0200 --- star-1.5.1-orig/libfind/find.c 2009-11-15 16:25:02.000000000 +0100
+++ star-1.5/libfind/find.c 2009-04-08 10:54:48.000000000 +0200 +++ star-1.5.1/libfind/find.c 2010-01-13 13:17:10.000000000 +0100
@@ -1730,7 +1730,7 @@ doexec(f, ac, av, state) @@ -1747,7 +1747,7 @@ doexec(f, ac, av, state)
#endif #endif
av[ac] = NULL; /* -exec {} \; is not NULL terminated */ av[ac] = NULL; /* -exec {} \; is not NULL terminated */
- fexecve(av[0], state->std[0], state->std[1], state->std[2], - fexecve(av[0], state->std[0], state->std[1], state->std[2],
+ sch_fexecve(av[0], state->std[0], state->std[1], state->std[2], + sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
av, state->env); av, state->env);
err = geterrno();
#ifdef PLUS_DEBUG #ifdef PLUS_DEBUG
error("argsize %d\n",