mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-27 16:39:08 +00:00
Code Issues Releases Activity

Minor post warns stuff.

Browse Source 
1) Fix up vendor IDs for files I'm touching and put FBSDID in the right place.
2) Cast return value of snprintf to size_t rather than casting sizeof() to
   an int, 'cos we know snprintf returns a non-genative number.
3) Avoid 'char *blank = "";' by just strduping. This could be bad sometimes,
   but all these variables usually point at malloced memory so this makes
   them always point at malloced memory.
This commit is contained in:
David Malone 2002-03-30 13:44:45 +00:00
parent 356bf92dce
commit afa6d859f0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=93423
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/chpass/edit.c
View File

@ -31,9 +31,11 @@
* SUCH DAMAGE.
*/
#if 0
#ifndef lint
static const char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -252,12 +254,12 @@ bad: (void)fclose(fp);
while ((len = strlen(pw->pw_gecos)) && pw->pw_gecos[len - 1] == ',')
pw->pw_gecos[len - 1] = '\0';
if (snprintf(buf, sizeof(buf),
if ((size_t)snprintf(buf, sizeof(buf),
"%s:%s:%lu:%lu:%s:%ld:%ld:%s:%s:%s",
pw->pw_name, pw->pw_passwd, (unsigned long)pw->pw_uid,
(unsigned long)pw->pw_gid, pw->pw_class, (long)pw->pw_change,
(long)pw->pw_expire, pw->pw_gecos, pw->pw_dir,
pw->pw_shell) >= (int)sizeof(buf)) {
pw->pw_shell) >= sizeof(buf)) {
warnx("entries too long");
free(p);
return (0);

18
usr.bin/chpass/field.c
View File

@ -31,9 +31,11 @@
* SUCH DAMAGE.
*/
#if 0
#ifndef lint
static const char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -54,8 +56,6 @@ __FBSDID("$FreeBSD$");
#include "chpass.h"
#include "pathnames.h"
static char blank[] = "";
/* ARGSUSED */
int
p_login(char *p, struct passwd *pw, ENTRY *ep __unused)
@ -86,9 +86,7 @@ p_login(char *p, struct passwd *pw, ENTRY *ep __unused)
int
p_passwd(char *p, struct passwd *pw, ENTRY *ep __unused)
{
if (!*p)
pw->pw_passwd = blank; /* "NOLOGIN"; */
else if (!(pw->pw_passwd = strdup(p))) {
if (!(pw->pw_passwd = strdup(p))) {
warnx("can't save password entry");
return (1);
}
@ -155,9 +153,7 @@ p_gid(char *p, struct passwd *pw, ENTRY *ep __unused)
int
p_class(char *p, struct passwd *pw, ENTRY *ep __unused)
{
if (!*p)
pw->pw_class = blank;
else if (!(pw->pw_class = strdup(p))) {
if (!(pw->pw_class = strdup(p))) {
warnx("can't save entry");
return (1);
}
@ -189,9 +185,7 @@ p_expire(char *p, struct passwd *pw, ENTRY *ep __unused)
int
p_gecos(char *p, struct passwd *pw __unused, ENTRY *ep __unused)
{
if (!*p)
ep->save = blank;
else if (!(ep->save = strdup(p))) {
if (!(ep->save = strdup(p))) {
warnx("can't save entry");
return (1);
}

7
usr.bin/chpass/pw_yp.c
View File

@ -81,7 +81,6 @@ static HASHINFO openinfo = {
static char passwdbyname[] = "passwd.byname";
static char localhost[] = "localhost";
static char blank[] = "";
int force_old = 0;
int _use_yp = 0;
@ -437,8 +436,8 @@ yp_submit(struct passwd *pw)
master_yppasswd.newpw.pw_shell = strdup(pw->pw_shell);
master_yppasswd.newpw.pw_class = pw->pw_class != NULL
? strdup(pw->pw_class)
: blank;
master_yppasswd.oldpass = blank; /* not really needed */
: strdup("");
master_yppasswd.oldpass = strdup(""); /* not really needed */
master_yppasswd.domain = yp_domain;
} else {
yppasswd.newpw.pw_passwd = strdup(pw->pw_passwd);
@ -448,7 +447,7 @@ yp_submit(struct passwd *pw)
yppasswd.newpw.pw_gecos = strdup(pw->pw_gecos);
yppasswd.newpw.pw_dir = strdup(pw->pw_dir);
yppasswd.newpw.pw_shell = strdup(pw->pw_shell);
yppasswd.oldpass = blank;
yppasswd.oldpass = strdup("");
}
/* Get the user's password for authentication purposes. */