From 956d68c870866053dde8dcc7c0b0d642a1703a26 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Thu, 23 Apr 2009 17:34:46 +0000 Subject: [PATCH] * libmisc/loginprompt.c: Use exit(EXIT_FAILURE) instead of exit(1). * libmisc/loginprompt.c: Avoid implicit conversion of pointers to booleans. * libmisc/loginprompt.c: Ignore return value of putc(). --- ChangeLog | 8 ++++++++ libmisc/loginprompt.c | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 439acc12..6caf58f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-04-22 Nicolas François + + * libmisc/loginprompt.c: Use exit(EXIT_FAILURE) instead of + exit(1). + * libmisc/loginprompt.c: Avoid implicit conversion of pointers to + booleans. + * libmisc/loginprompt.c: Ignore return value of putc(). + 2009-04-22 Nicolas François * libmisc/env.c, libmisc/age.c: Added splint annotations. diff --git a/libmisc/loginprompt.c b/libmisc/loginprompt.c index 778475d1..1d968d76 100644 --- a/libmisc/loginprompt.c +++ b/libmisc/loginprompt.c @@ -2,7 +2,7 @@ * Copyright (c) 1989 - 1993, Julianne Frances Haugh * Copyright (c) 1996 - 2000, Marek Michałkiewicz * Copyright (c) 2003 - 2005, Tomasz Kłoczko - * Copyright (c) 2008 , Nicolas François + * Copyright (c) 2008 - 2009, Nicolas François * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ static void login_exit (unused int sig) { - exit (1); + exit (EXIT_FAILURE); } /* @@ -86,13 +86,13 @@ void login_prompt (const char *prompt, char *name, int namesize) * be displayed and display it before the prompt. */ - if (prompt) { + if (NULL != prompt) { cp = getdef_str ("ISSUE_FILE"); if (NULL != cp) { fp = fopen (cp, "r"); if (NULL != fp) { while ((i = getc (fp)) != EOF) { - putc (i, stdout); + (void) putc (i, stdout); } (void) fclose (fp); @@ -110,12 +110,12 @@ void login_prompt (const char *prompt, char *name, int namesize) memzero (buf, sizeof buf); if (fgets (buf, (int) sizeof buf, stdin) != buf) { - exit (1); + exit (EXIT_FAILURE); } cp = strchr (buf, '\n'); if (NULL == cp) { - exit (1); + exit (EXIT_FAILURE); } *cp = '\0'; /* remove \n [ must be there ] */