Attachment #192085 for bug #270796

View | Details | Raw Unified | Return to bug 270796
Collapse All | Expand All

Lines 323-329 scg_yes(msg) Link Here

(-)cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c (-1 / +1 lines)
323		323
324	js_printf("%s", msg);	324	js_printf("%s", msg);
325	flush();	325	flush();
326	if (getline(okbuf, sizeof (okbuf)) == EOF)	326	if (get_line(okbuf, sizeof (okbuf)) == EOF)
327	exit(EX_BAD);	327	exit(EX_BAD);
328	if (streql(okbuf, "y") \|\| streql(okbuf, "yes") \|\|	328	if (streql(okbuf, "y") \|\| streql(okbuf, "yes") \|\|
329	streql(okbuf, "Y") \|\| streql(okbuf, "YES"))	329	streql(okbuf, "Y") \|\| streql(okbuf, "YES"))




	} while (p != NULL);
	va_end(args);

	ret = f_execve(name, in, out, err, av, env);
	if (av != xav)
		free(av);
	return (ret);

	char *av[];
{
	av[ac] = NULL;			/*  force list to be null terminated */
	return (f_execve(name, in, out, err, av, environ));
}

EXPORT int
f_execve(name, in, out, err, av, env)
	const char *name;
	FILE *in, *out, *err;
	char * const av[], * const env[];

Lines 64-70 fgetline(f, buf, len) Link Here

(-)cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c (-1 / +1 lines)
64	}	64	}
65		65
66	EXPORT int	66	EXPORT int
67	getline(buf, len)	67	get_line(buf, len)
68	char *buf;	68	char *buf;
69	int len;	69	int len;
70	{	70	{

Return to bug 270796

Lines 159-165 fexecle(name, in, out, err, va_alist) Link Here

(-)cdrdao-1.2.2.orig/scsilib/libschily/fexec.c (-3 / +3 lines)
159	} while (p != NULL);	159	} while (p != NULL);
160	va_end(args);	160	va_end(args);
161		161
162	ret = fexecve(name, in, out, err, av, env);	162	ret = f_execve(name, in, out, err, av, env);
163	if (av != xav)	163	if (av != xav)
164	free(av);	164	free(av);
165	return (ret);	165	return (ret);
Lines 173-183 fexecv(name, in, out, err, ac, av) Link Here
173	char *av[];	173	char *av[];
174	{	174	{
175	av[ac] = NULL; /* force list to be null terminated */	175	av[ac] = NULL; /* force list to be null terminated */
176	return (fexecve(name, in, out, err, av, environ));	176	return (f_execve(name, in, out, err, av, environ));
177	}	177	}
178		178
179	EXPORT int	179	EXPORT int
180	fexecve(name, in, out, err, av, env)	180	f_execve(name, in, out, err, av, env)
181	const char *name;	181	const char *name;
182	FILE in, out, *err;	182	FILE in, out, *err;
183	char * const av[], * const env[];	183	char * const av[], * const env[];

Lines 108-114 extern int fexecle __PR((const char *, F Link Here

(-)cdrdao-1.2.2.orig/scsilib/include/schily.h (-2 / +2 lines)
108	/* 6th arg not const, fexecv forces av[ac] = NULL */	108	/* 6th arg not const, fexecv forces av[ac] = NULL */
109	extern int fexecv __PR((const char , FILE , FILE , FILE , int,	109	extern int fexecv __PR((const char , FILE , FILE , FILE , int,
110	char **));	110	char **));
111	extern int fexecve __PR((const char , FILE , FILE , FILE ,	111	extern int f_execve __PR((const char , FILE , FILE , FILE ,
112	char * const , char const *));	112	char * const , char const *));
113	extern int fspawnv __PR((FILE , FILE , FILE , int, char const *));	113	extern int fspawnv __PR((FILE , FILE , FILE , int, char const *));
114	extern int fspawnl __PR((FILE , FILE , FILE *,	114	extern int fspawnl __PR((FILE , FILE , FILE *,
Lines 187-193 extern char fillbytes __PR((void , int Link Here
187	extern char findbytes __PR((const void , int, char));	187	extern char findbytes __PR((const void , int, char));
188	extern int findline __PR((const char , char, const char ,	188	extern int findline __PR((const char , char, const char ,
189	int, char **, int));	189	int, char **, int));
190	extern int getline __PR((char *, int));	190	extern int get_line __PR((char *, int));
191	extern int getstr __PR((char *, int));	191	extern int getstr __PR((char *, int));
192	extern int breakline __PR((char , char, char *, int));	192	extern int breakline __PR((char , char, char *, int));
193	extern int getallargs __PR((int , char const*, const char , ...));	193	extern int getallargs __PR((int , char const*, const char , ...));