Attachment #191877 for bug #270486




/*----------------------------------------------------------------*/

static void usage(void);
static int awesfx_getline(FILE *fp);
static int nextline(FILE *fp);
static char *gettok(FILE *fp);
static char *divtok(char *src, char *divs, int only_one);

	}

	curline = 0;
	if (!awesfx_getline(fp))
		return 0;

	seq_init(seq_devname, seq_devidx);

 * read a line and parse tokens
 *----------------------------------------------------------------*/

static int awesfx_getline(FILE *fp)
{
	char *p;
	curline++;

{
	if (connected) {
		do {
			if (! awesfx_getline(fp))
				return FALSE;
		} while (connected);
		return TRUE;
	} else {
		return awesfx_getline(fp);
	}
}


	tok = divtok(NULL, " \t\r\n", FALSE);
	while (tok == NULL || *tok == 0) {
		if (! connected) return NULL;
		if (! awesfx_getline(fp)) return NULL;
		tok = divtok(line, " \t\r\n", FALSE);
	}
	return tok;

Return to bug 270486

Lines 37-43 Link Here

(-)setfx.c (-6 / +6 lines)
37	/----------------------------------------------------------------/	37	/----------------------------------------------------------------/
38		38
39	static void usage(void);	39	static void usage(void);
40	static int getline(FILE *fp);	40	static int awesfx_getline(FILE *fp);
41	static int nextline(FILE *fp);	41	static int nextline(FILE *fp);
42	static char gettok(FILE fp);	42	static char gettok(FILE fp);
43	static char divtok(char src, char *divs, int only_one);	43	static char divtok(char src, char *divs, int only_one);
Lines 126-132 Link Here
126	}	126	}
127		127
128	curline = 0;	128	curline = 0;
129	if (!getline(fp))	129	if (!awesfx_getline(fp))
130	return 0;	130	return 0;
131		131
132	seq_init(seq_devname, seq_devidx);	132	seq_init(seq_devname, seq_devidx);
Lines 370-376 Link Here
370	* read a line and parse tokens	370	* read a line and parse tokens
371	----------------------------------------------------------------/	371	----------------------------------------------------------------/
372		372
373	static int getline(FILE *fp)	373	static int awesfx_getline(FILE *fp)
374	{	374	{
375	char *p;	375	char *p;
376	curline++;	376	curline++;
Lines 393-404 Link Here
393	{	393	{
394	if (connected) {	394	if (connected) {
395	do {	395	do {
396	if (! getline(fp))	396	if (! awesfx_getline(fp))
397	return FALSE;	397	return FALSE;
398	} while (connected);	398	} while (connected);
399	return TRUE;	399	return TRUE;
400	} else {	400	} else {
401	return getline(fp);	401	return awesfx_getline(fp);
402	}	402	}
403	}	403	}
404		404
Lines 415-421 Link Here
415	tok = divtok(NULL, " \t\r\n", FALSE);	415	tok = divtok(NULL, " \t\r\n", FALSE);
416	while (tok == NULL \|\| *tok == 0) {	416	while (tok == NULL \|\| *tok == 0) {
417	if (! connected) return NULL;	417	if (! connected) return NULL;
418	if (! getline(fp)) return NULL;	418	if (! awesfx_getline(fp)) return NULL;
419	tok = divtok(line, " \t\r\n", FALSE);	419	tok = divtok(line, " \t\r\n", FALSE);
420	}	420	}
421	return tok;	421	return tok;