Commit d7050b44 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix warnings about ignoring fgets return value

parent 91ca3320

apps/ca.c

+12 −2
Original line number Diff line number Diff line
@@ -1249,7 +1249,12 @@ bad: 
				BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total);

				(void)BIO_flush(bio_err);

				buf[0][0]='\0';

				fgets(buf[0],10,stdin);

				if (!fgets(buf[0],10,stdin))

					{

					BIO_printf(bio_err,"CERTIFICATION CANCELED: I/O error\n"); 

					ret=0;

					goto err;

					}

				if ((buf[0][0] != 'y') && (buf[0][0] != 'Y'))

					{

					BIO_printf(bio_err,"CERTIFICATION CANCELED\n");
@@ -2101,7 +2106,12 @@ again2: 
		BIO_printf(bio_err,"Sign the certificate? [y/n]:");

		(void)BIO_flush(bio_err);

		buf[0]='\0';

		fgets(buf,sizeof(buf)-1,stdin);

		if (!fgets(buf,sizeof(buf)-1,stdin))

			{

			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");

			ok=0;

			goto err;

			}

		if (!((buf[0] == 'y') || (buf[0] == 'Y')))

			{

			BIO_printf(bio_err,"CERTIFICATE WILL NOT BE CERTIFIED\n");

apps/enc.c

+6 −1
Original line number Diff line number Diff line
@@ -226,7 +226,12 @@ int MAIN(int argc, char **argv) 
				goto bad;

				}

			buf[0]='\0';

			fgets(buf,sizeof buf,infile);

			if (!fgets(buf,sizeof buf,infile))

				{

				BIO_printf(bio_err,"unable to read key from '%s'\n",

					file);

				goto bad;

				}

			fclose(infile);

			i=strlen(buf);

			if ((i > 0) &&

apps/openssl.c

+2 −1
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ int main(int Argc, char *Argv[]) 
			else	prompt="OpenSSL> ";

			fputs(prompt,stdout);

			fflush(stdout);

			fgets(p,n,stdin);

			if (!fgets(p,n,stdin))

				goto end;

			if (p[0] == '\0') goto end;

			i=strlen(p);

			if (i <= 1) break;

apps/req.c

+4 −2
Original line number Diff line number Diff line
@@ -1538,7 +1538,8 @@ start: 
		buf[0]='\0';

		if (!batch)

			{

			fgets(buf,sizeof buf,stdin);

			if (!fgets(buf,sizeof buf,stdin))

				return 0;

			}

		else

			{
@@ -1596,7 +1597,8 @@ start: 
		buf[0]='\0';

		if (!batch)

			{

			fgets(buf,sizeof buf,stdin);

			if (!fgets(buf,sizeof buf,stdin))

				return 0;

			}

		else

			{

crypto/ui/ui_openssl.c

+7 −4
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int is_a_tty; 


/* Declare static functions */

#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE)

static void read_till_nl(FILE *);

static int read_till_nl(FILE *);

static void recsig(int);

static void pushsig(void);

static void popsig(void);
@@ -390,14 +390,16 @@ static int read_string(UI *ui, UI_STRING *uis) 


#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE)

/* Internal functions to read a string without echoing */

static void read_till_nl(FILE *in)

static int read_till_nl(FILE *in)

	{

#define SIZE 4

	char buf[SIZE+1];



	do	{

		fgets(buf,SIZE,in);

		if (!fgets(buf,SIZE,in))

			return 0;

		} while (strchr(buf,'\n') == NULL);

	return 1;

	}



static volatile sig_atomic_t intr_signal;
@@ -445,7 +447,8 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl) 
			*p='\0';

		}

	else

		read_till_nl(tty_in);

		if (!read_till_nl(tty_in))

			goto error;

	if (UI_set_result(ui, uis, result) >= 0)

		ok=1;