[Pkg-shadow-commits] r3224 - in upstream/trunk: lib libmisc src
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sat Aug 21 15:32:55 UTC 2010
Author: nekral-guest
Date: 2010-08-21 15:32:53 +0000 (Sat, 21 Aug 2010)
New Revision: 3224
Modified:
upstream/trunk/lib/commonio.c
upstream/trunk/lib/commonio.h
upstream/trunk/lib/prototypes.h
upstream/trunk/libmisc/console.c
upstream/trunk/libmisc/failure.c
upstream/trunk/libmisc/hushed.c
upstream/trunk/libmisc/list.c
upstream/trunk/libmisc/loginprompt.c
upstream/trunk/libmisc/motd.c
upstream/trunk/libmisc/pam_pass_non_interractive.c
upstream/trunk/libmisc/setupenv.c
upstream/trunk/libmisc/sulog.c
upstream/trunk/libmisc/system.c
upstream/trunk/libmisc/ttytype.c
upstream/trunk/src/login.c
upstream/trunk/src/userdel.c
upstream/trunk/src/vipw.c
Log:
* libmisc/console.c, libmisc/motd.c, libmisc/setupenv.c,
libmisc/sulog.c, libmisc/hushed.c, libmisc/failure.c,
libmisc/loginprompt.c, libmisc/ttytype.c,
libmisc/pam_pass_non_interractive.c, src/userdel.c, src/login.c,
lib/commonio.c, lib/commonio.h: Fix some const issues.
* libmisc/motd.c: Avoid multi-statements lines.
* libmisc/motd.c: Support long MOTD_FILE.
* libmisc/list.c, lib/prototypes.h: Revert previous change.
dup_list and is_on_list are used with members as defined for the
group structure, and thus even if the list is not modified, the
list elements cannot be constant strings.
* libmisc/system.c: Avoid C++ comments.
* src/vipw.c: WITH_TCB cannot be tested inside a gettextized
string. Split the Usage string.
* lib/commonio.h: Re-indent.
Modified: upstream/trunk/lib/commonio.c
===================================================================
--- upstream/trunk/lib/commonio.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/lib/commonio.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -780,7 +780,8 @@
/*
* Sort entries in db according to order in another.
*/
-int commonio_sort_wrt (struct commonio_db *shadow, struct commonio_db *passwd)
+int commonio_sort_wrt (struct commonio_db *shadow,
+ const struct commonio_db *passwd)
{
struct commonio_entry *head = NULL, *pw_ptr, *spw_ptr;
const char *name;
Modified: upstream/trunk/lib/commonio.h
===================================================================
--- upstream/trunk/lib/commonio.h 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/lib/commonio.h 2010-08-21 15:32:53 UTC (rev 3224)
@@ -151,10 +151,10 @@
extern int commonio_close (struct commonio_db *);
extern int commonio_unlock (struct commonio_db *);
extern void commonio_del_entry (struct commonio_db *,
- const struct commonio_entry *);
+ const struct commonio_entry *);
extern int commonio_sort_wrt (struct commonio_db *shadow,
- struct commonio_db *passwd);
+ const struct commonio_db *passwd);
extern int commonio_sort (struct commonio_db *db,
- int (*cmp) (const void *, const void *));
+ int (*cmp) (const void *, const void *));
#endif
Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/lib/prototypes.h 2010-08-21 15:32:53 UTC (rev 3224)
@@ -214,8 +214,8 @@
/* list.c */
extern /*@only@*/ /*@out@*/char **add_list (/*@returned@*/ /*@only@*/char **, const char *);
extern /*@only@*/ /*@out@*/char **del_list (/*@returned@*/ /*@only@*/char **, const char *);
-extern /*@only@*/ /*@out@*/char **dup_list (const char *const *);
-extern bool is_on_list (const char *const *list, const char *member);
+extern /*@only@*/ /*@out@*/char **dup_list (char *const *);
+extern bool is_on_list (char *const *list, const char *member);
extern /*@only@*/char **comma_to_list (const char *);
/* log.c */
Modified: upstream/trunk/libmisc/console.c
===================================================================
--- upstream/trunk/libmisc/console.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/console.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -50,7 +50,8 @@
static bool is_listed (const char *cfgin, const char *tty, bool def)
{
FILE *fp;
- char buf[200], *cons, *s;
+ char buf[200], *s;
+ const char *cons;
/*
* If the CONSOLE configuration definition isn't given,
Modified: upstream/trunk/libmisc/failure.c
===================================================================
--- upstream/trunk/libmisc/failure.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/failure.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -296,7 +296,7 @@
#endif /* !USE_UTMPX */
)
{
- char *ftmp;
+ const char *ftmp;
int fd;
/*
Modified: upstream/trunk/libmisc/hushed.c
===================================================================
--- upstream/trunk/libmisc/hushed.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/hushed.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -50,7 +50,7 @@
bool hushed (const char *username)
{
struct passwd *pw;
- char *hushfile;
+ const char *hushfile;
char buf[BUFSIZ];
bool found;
FILE *fp;
Modified: upstream/trunk/libmisc/list.c
===================================================================
--- upstream/trunk/libmisc/list.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/list.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -141,7 +141,13 @@
return tmp;
}
-/*@only@*/ /*@out@*/char **dup_list (const char *const *list)
+/*
+ * Duplicate a list.
+ * The input list is not modified, but in order to allow the use of this
+ * function with list of members, the list elements are not enforced to be
+ * constant strings here.
+ */
+/*@only@*/ /*@out@*/char **dup_list (char *const *list)
{
int i;
char **tmp;
@@ -163,7 +169,13 @@
return tmp;
}
-bool is_on_list (const char *const *list, const char *member)
+/*
+ * Check if member is part of the input list
+ * The input list is not modified, but in order to allow the use of this
+ * function with list of members, the list elements are not enforced to be
+ * constant strings here.
+ */
+bool is_on_list (char *const *list, const char *member)
{
assert (NULL != member);
assert (NULL != list);
@@ -187,7 +199,7 @@
char *members;
char **array;
int i;
- const char *cp;
+ char *cp;
char *cp2;
assert (NULL != comma);
Modified: upstream/trunk/libmisc/loginprompt.c
===================================================================
--- upstream/trunk/libmisc/loginprompt.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/loginprompt.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -87,9 +87,9 @@
*/
if (NULL != prompt) {
- cp = getdef_str ("ISSUE_FILE");
- if (NULL != cp) {
- fp = fopen (cp, "r");
+ const char *fname = getdef_str ("ISSUE_FILE");
+ if (NULL != fname) {
+ fp = fopen (fname, "r");
if (NULL != fp) {
while ((i = getc (fp)) != EOF) {
(void) putc (i, stdout);
Modified: upstream/trunk/libmisc/motd.c
===================================================================
--- upstream/trunk/libmisc/motd.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/motd.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -2,6 +2,7 @@
* Copyright (c) 1989 - 1991, Julianne Frances Haugh
* Copyright (c) 1996 - 1997, Marek Michałkiewicz
* Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * Copyright (c) 2010 , Nicolas François
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -47,21 +48,34 @@
void motd (void)
{
FILE *fp;
- char motdlist[BUFSIZ], *motdfile, *mb;
+ char *motdlist;
+ const char *motdfile;
+ char *mb;
register int c;
- if ((mb = getdef_str ("MOTD_FILE")) == NULL)
+ motdfile = getdef_str ("MOTD_FILE");
+ if (NULL == motdfile) {
return;
+ }
- strncpy (motdlist, mb, sizeof (motdlist));
- motdlist[sizeof (motdlist) - 1] = '\0';
+ motdlist = xstrdup (motdfile);
- for (mb = motdlist; (motdfile = strtok (mb, ":")) != NULL; mb = NULL) {
- if ((fp = fopen (motdfile, "r")) != NULL) {
- while ((c = getc (fp)) != EOF)
+ for (mb = motdlist; ;mb = NULL) {
+ motdfile = strtok (mb, ":");
+ if (NULL == motdfile) {
+ break;
+ }
+
+ fp = fopen (motdfile, "r");
+ if (NULL != fp) {
+ while ((c = getc (fp)) != EOF) {
putchar (c);
+ }
fclose (fp);
}
}
fflush (stdout);
+
+ free (motdlist);
}
+
Modified: upstream/trunk/libmisc/pam_pass_non_interractive.c
===================================================================
--- upstream/trunk/libmisc/pam_pass_non_interractive.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/pam_pass_non_interractive.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -39,7 +39,7 @@
#include <security/pam_appl.h>
#include "prototypes.h"
-/*@null@*/ /*@only@*/static char *non_interactive_password = NULL;
+/*@null@*/ /*@only@*/static const char *non_interactive_password = NULL;
static int ni_conv (int num_msg,
const struct pam_message **msg,
struct pam_response **resp,
Modified: upstream/trunk/libmisc/setupenv.c
===================================================================
--- upstream/trunk/libmisc/setupenv.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/setupenv.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -202,7 +202,7 @@
#ifndef USE_PAM
char *envf;
#endif
- char *cp;
+ const char *cp;
/*
* Change the current working directory to be the home directory
Modified: upstream/trunk/libmisc/sulog.c
===================================================================
--- upstream/trunk/libmisc/sulog.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/sulog.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -47,7 +47,7 @@
*/
void sulog (const char *tty, bool success, const char *oldname, const char *name)
{
- char *sulog_file;
+ const char *sulog_file;
time_t now;
struct tm *tm;
FILE *fp;
@@ -62,8 +62,10 @@
"FAILED su for %s by %s",name,oldname));
}
- if ((sulog_file = getdef_str ("SULOG_FILE")) == (char *) 0)
+ sulog_file = getdef_str ("SULOG_FILE");
+ if (NULL == sulog_file) {
return;
+ }
oldgid = getgid ();
oldmask = umask (077);
Modified: upstream/trunk/libmisc/system.c
===================================================================
--- upstream/trunk/libmisc/system.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/system.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -60,9 +60,9 @@
fd = open ("/dev/null", O_RDWR);
/* Child */
- dup2 (fd, 0); // Close Stdin
+ dup2 (fd, 0); /* Close Stdin */
if (ignore_stderr) {
- dup2 (fd, 2); // Close Stderr
+ dup2 (fd, 2); /* Close Stderr */
}
execve (command, (char *const *) argv, (char *const *) env);
Modified: upstream/trunk/libmisc/ttytype.c
===================================================================
--- upstream/trunk/libmisc/ttytype.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/libmisc/ttytype.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -45,7 +45,7 @@
{
FILE *fp;
char buf[BUFSIZ];
- char *typefile;
+ const char *typefile;
char *cp;
char type[BUFSIZ];
char port[BUFSIZ];
Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/src/login.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -533,7 +533,7 @@
#endif
int err;
const char *cp;
- char *tmp;
+ const char *tmp;
char fromhost[512];
struct passwd *pwd = NULL;
char **envp = environ;
Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/src/userdel.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -596,7 +596,7 @@
static void user_cancel (const char *user)
{
- char *cmd;
+ const char *cmd;
pid_t pid, wpid;
int status;
Modified: upstream/trunk/src/vipw.c
===================================================================
--- upstream/trunk/src/vipw.c 2010-08-21 15:22:39 UTC (rev 3223)
+++ upstream/trunk/src/vipw.c 2010-08-21 15:32:53 UTC (rev 3224)
@@ -83,19 +83,19 @@
*/
static void usage (int status)
{
- (void)
- fputs (_("Usage: vipw [options]\n"
- "\n"
- "Options:\n"
- " -g, --group edit group database\n"
- " -h, --help display this help message and exit\n"
- " -p, --passwd edit passwd database\n"
- " -q, --quiet quiet mode\n"
- " -s, --shadow edit shadow or gshadow database\n"
+ FILE *usageout = (E_SUCCESS != status) ? stderr : stdout;
+ (void) fputs (_("Usage: vipw [options]\n"
+ "\n"
+ "Options:\n"), usageout);
+ (void) fputs (_(" -g, --group edit group database\n"), usageout);
+ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
+ (void) fputs (_(" -p, --passwd edit passwd database\n"), usageout);
+ (void) fputs (_(" -q, --quiet quiet mode\n"), usageout);
+ (void) fputs (_(" -s, --shadow edit shadow or gshadow database\n"), usageout);
#ifdef WITH_TCB
- " -u, --user which user's tcb shadow file to edit\n"
+ (void) fputs (_(" -u, --user which user's tcb shadow file to edit\n"), usageout);
#endif /* WITH_TCB */
- "\n"), (E_SUCCESS != status) ? stderr : stdout);
+ (void) fputs (_("\n"), usageout);
exit (status);
}
More information about the Pkg-shadow-commits
mailing list