Attachment #191945 for bug #270372

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




	} 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 76-82 fgetline(f, buf, len) Link Here

(-)cdrkit-1.1.9.orig/librols/stdio/fgetline.c (-1 / +1 lines)
76	}	76	}
77		77
78	EXPORT int	78	EXPORT int
79	getline(buf, len)	79	get_line(buf, len)
80	char *buf;	80	char *buf;
81	int len;	81	int len;
82	{	82	{

Lines 301-307 usal_yes(char *msg) Link Here

(-)cdrkit-1.1.9.orig/libusal/scsitransp.c (-1 / +1 lines)
301		301
302	printf("%s", msg);	302	printf("%s", msg);
303	flush();	303	flush();
304	if (getline(okbuf, sizeof (okbuf)) == EOF)	304	if (get_line(okbuf, sizeof (okbuf)) == EOF)
305	exit(EX_BAD);	305	exit(EX_BAD);
306	if (streql(okbuf, "y") \|\| streql(okbuf, "yes") \|\|	306	if (streql(okbuf, "y") \|\| streql(okbuf, "yes") \|\|
307	streql(okbuf, "Y") \|\| streql(okbuf, "YES"))	307	streql(okbuf, "Y") \|\| streql(okbuf, "YES"))

Lines 130-136 BOOL getvalue(char s, long lp, long mi Link Here

(-)cdrkit-1.1.9.orig/readom/io.c (-2 / +2 lines)
130	(prt)(s, lp, mini, maxi, dp);	130	(prt)(s, lp, mini, maxi, dp);
131	flush();	131	flush();
132	line[0] = '\0';	132	line[0] = '\0';
133	if (getline(line, 80) == EOF)	133	if (get_line(line, 80) == EOF)
134	exit(EX_BAD);	134	exit(EX_BAD);
135		135
136	linep = skipwhite(line);	136	linep = skipwhite(line);
Lines 178-184 again: Link Here
178	vprintf(form, args);	178	vprintf(form, args);
179	va_end(args);	179	va_end(args);
180	flush();	180	flush();
181	if (getline(okbuf, sizeof(okbuf)) == EOF)	181	if (get_line(okbuf, sizeof(okbuf)) == EOF)
182	exit(EX_BAD);	182	exit(EX_BAD);
183	if (okbuf[0] == '?') {	183	if (okbuf[0] == '?') {
184	printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");	184	printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");

Lines 1605-1611 read_generic(SCSI usalp, parm_t parmp, Link Here

(-)cdrkit-1.1.9.orig/readom/readom.c (-2 / +2 lines)
1605	fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",	1605	fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
1606	usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));	1606	usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
1607	fprintf(stderr, "Enter filename [%s]: ", defname); flush();	1607	fprintf(stderr, "Enter filename [%s]: ", defname); flush();
1608	(void) getline(filename, sizeof (filename));	1608	(void) get_line(filename, sizeof (filename));
1609	}	1609	}
1610		1610
1611	if (askrange) {	1611	if (askrange) {
Lines 1772-1778 write_disk(SCSI usalp, parm_t parmp) Link Here
1772	fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",	1772	fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
1773	usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));	1773	usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
1774	fprintf(stderr, "Enter filename [%s]: ", defname); flush();	1774	fprintf(stderr, "Enter filename [%s]: ", defname); flush();
1775	(void) getline(filename, sizeof (filename));	1775	(void) get_line(filename, sizeof (filename));
1776	fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");	1776	fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
1777		1777
1778	getlong("Enter starting sector for copy:", &addr, 0L, end-1);	1778	getlong("Enter starting sector for copy:", &addr, 0L, end-1);




static	char	*peekword(void);
static	char	*lineend(void);
static	char	*markword(char *delim);
static	char	get_delim(void);
static	char	*getnextitem(char *delim);
static	char	*neednextitem(char *delim);
static	char	*nextword(void);

	if (kp == NULL)
		cueabort("Unknown filetype '%s'", word);

	if (get_delim() == '/') {
		word = needitem();
		if (*astol(++word, &secsize) != '\0')
			cueabort("Not a number '%s'", word);

}

static char 
get_delim()
{
	return (wordendc);
}

Return to bug 270372

Lines 253-259 static char skipwhite(const char s); Link Here

(-)cdrkit-1.1.9.orig/wodim/cue.c (-3 / +3 lines)
253	static char *peekword(void);	253	static char *peekword(void);
254	static char *lineend(void);	254	static char *lineend(void);
255	static char markword(char delim);	255	static char markword(char delim);
256	static char getdelim(void);	256	static char get_delim(void);
257	static char getnextitem(char delim);	257	static char getnextitem(char delim);
258	static char neednextitem(char delim);	258	static char neednextitem(char delim);
259	static char *nextword(void);	259	static char *nextword(void);
Lines 746-752 parse_track(track_t trackp[], state_t *s Link Here
746	if (kp == NULL)	746	if (kp == NULL)
747	cueabort("Unknown filetype '%s'", word);	747	cueabort("Unknown filetype '%s'", word);
748		748
749	if (getdelim() == '/') {	749	if (get_delim() == '/') {
750	word = needitem();	750	word = needitem();
751	if (*astol(++word, &secsize) != '\0')	751	if (*astol(++word, &secsize) != '\0')
752	cueabort("Not a number '%s'", word);	752	cueabort("Not a number '%s'", word);
Lines 1128-1134 linelen--; Link Here
1128	}	1128	}
1129		1129
1130	static char	1130	static char
1131	getdelim()	1131	get_delim()
1132	{	1132	{
1133	return (wordendc);	1133	return (wordendc);
1134	}	1134	}

Lines 116-122 extern int fexecl(const char , FILE , Link Here

(-)cdrkit-1.1.9.orig/include/schily.h (-2 / +2 lines)
116	extern int fexecle(const char , FILE , FILE , FILE , const char *, ...);	116	extern int fexecle(const char , FILE , FILE , FILE , const char *, ...);
117	/* 6th arg not const, fexecv forces av[ac] = NULL */	117	/* 6th arg not const, fexecv forces av[ac] = NULL */
118	extern int fexecv(const char , FILE , FILE , FILE , int, char **);	118	extern int fexecv(const char , FILE , FILE , FILE , int, char **);
119	extern int fexecve(const char , FILE , FILE , FILE , char * const *,	119	extern int f_execve(const char , FILE , FILE , FILE , char * const *,
120	char * const *);	120	char * const *);
121	extern int fspawnv(FILE , FILE , FILE , int, char const *);	121	extern int fspawnv(FILE , FILE , FILE , int, char const *);
122	extern int fspawnl(FILE , FILE , FILE , const char , const char *, ...);	122	extern int fspawnl(FILE , FILE , FILE , const char , const char *, ...);
Lines 190-196 extern int schily_error(const char *, .. Link Here
190	extern char fillbytes(void , int, char);	190	extern char fillbytes(void , int, char);
191	extern char findbytes(const void , int, char);	191	extern char findbytes(const void , int, char);
192	extern int findline(const char , char, const char , int, char **, int);	192	extern int findline(const char , char, const char , int, char **, int);
193	extern int getline(char *, int);	193	extern int get_line(char *, int);
194	extern int getstr(char *, int);	194	extern int getstr(char *, int);
195	extern int breakline(char , char, char *, int);	195	extern int breakline(char , char, char *, int);
196	extern int getallargs(int , char const*, const char , ...);	196	extern int getallargs(int , char const*, const char , ...);

Lines 170-176 fexecle(name, in, out, err, va_alist) Link Here

(-)cdrkit-1.1.9.orig/librols/fexec.c (-3 / +3 lines)
170	} while (p != NULL);	170	} while (p != NULL);
171	va_end(args);	171	va_end(args);
172		172
173	ret = fexecve(name, in, out, err, av, env);	173	ret = f_execve(name, in, out, err, av, env);
174	if (av != xav)	174	if (av != xav)
175	free(av);	175	free(av);
176	return (ret);	176	return (ret);
Lines 184-194 fexecv(name, in, out, err, ac, av) Link Here
184	char *av[];	184	char *av[];
185	{	185	{
186	av[ac] = NULL; /* force list to be null terminated */	186	av[ac] = NULL; /* force list to be null terminated */
187	return (fexecve(name, in, out, err, av, environ));	187	return (f_execve(name, in, out, err, av, environ));
188	}	188	}
189		189
190	EXPORT int	190	EXPORT int
191	fexecve(name, in, out, err, av, env)	191	f_execve(name, in, out, err, av, env)
192	const char *name;	192	const char *name;
193	FILE in, out, *err;	193	FILE in, out, *err;
194	char * const av[], * const env[];	194	char * const av[], * const env[];