X-Git-Url: https://git.cameronkatri.com/pw-darwin.git/blobdiff_plain/3531aab720184b36e2c61cd9c06de07c8b0724b8..908a8140bcf46c17b5136443b301f75adfd1c4b6:/chpass/pw_copy.c?ds=inline diff --git a/chpass/pw_copy.c b/chpass/pw_copy.c index b2c234c..73e2da2 100644 --- a/chpass/pw_copy.c +++ b/chpass/pw_copy.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)pw_copy.c 8.4 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)pw_copy.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ /* @@ -44,6 +44,7 @@ static char sccsid[] = "@(#)pw_copy.c 8.4 (Berkeley) 4/2/94"; #include #include #include +#include #include #include "pw_copy.h" @@ -65,8 +66,8 @@ pw_copy(ffd, tfd, pw) snprintf(uidstr, sizeof(uidstr), "%d", pw->pw_uid); snprintf(gidstr, sizeof(gidstr), "%d", pw->pw_gid); - snprintf(chgstr, sizeof(chgstr), "%lu", pw->pw_change); - snprintf(expstr, sizeof(expstr), "%lu", pw->pw_expire); + snprintf(chgstr, sizeof(chgstr), "%ld", pw->pw_change); + snprintf(expstr, sizeof(expstr), "%ld", pw->pw_expire); if (!(from = fdopen(ffd, "r"))) pw_error(_PATH_MASTERPASSWD, 1, 1); @@ -96,7 +97,7 @@ pw_copy(ffd, tfd, pw) goto err; continue; } - (void)fprintf(to, "%s:%s:%s:%s:%s:%ld:%ld:%s:%s:%s\n", + (void)fprintf(to, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n", pw->pw_name, pw->pw_passwd, pw->pw_fields & _PWF_UID ? uidstr : "", pw->pw_fields & _PWF_GID ? gidstr : "", @@ -117,7 +118,7 @@ pw_copy(ffd, tfd, pw) pw_error(NULL, 0, 1); } else #endif /* YP */ - (void)fprintf(to, "%s:%s:%s:%s:%s:%ld:%ld:%s:%s:%s\n", + (void)fprintf(to, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n", pw->pw_name, pw->pw_passwd, pw->pw_fields & _PWF_UID ? uidstr : "", pw->pw_fields & _PWF_GID ? gidstr : "",