diff options
| author | grant <grant> | 2003-06-24 06:44:59 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-06-24 06:44:59 +0000 |
| commit | f577b050819b7c3eed752a00dfc9bfabe09714d2 (patch) | |
| tree | 2115e4b00c012b746372551e52f863256b7f9f18 | |
| parent | 0dc61391ba714ab74c2ceebb2ffeb8476c089b31 (diff) | |
| download | pkgsrc-f577b050819b7c3eed752a00dfc9bfabe09714d2.tar.gz | |
sync with -current:
gen_subs.c 1.28
tar.c 1.41
| -rw-r--r-- | archivers/pax/files/gen_subs.c | 8 | ||||
| -rw-r--r-- | archivers/pax/files/tar.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/archivers/pax/files/gen_subs.c b/archivers/pax/files/gen_subs.c index 9be8881a52d..df9f9c88fe0 100644 --- a/archivers/pax/files/gen_subs.c +++ b/archivers/pax/files/gen_subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: gen_subs.c,v 1.1.1.1 2003/06/23 11:46:22 grant Exp $ */ +/* $NetBSD: gen_subs.c,v 1.2 2003/06/24 06:44:59 grant Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -47,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: gen_subs.c,v 1.1.1.1 2003/06/23 11:46:22 grant Exp $"); +__RCSID("$NetBSD: gen_subs.c,v 1.2 2003/06/24 06:44:59 grant Exp $"); #endif #endif /* not lint */ @@ -127,8 +127,8 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp) */ if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0) f_date[0] = '\0'; - user = user_from_uid(sbp->st_uid, 0); - group = group_from_gid(sbp->st_gid, 0); + user = (char *)user_from_uid(sbp->st_uid, 0); + group = (char *)group_from_gid(sbp->st_gid, 0); (void)fprintf(fp, "%s%2lu %-*s %-*s ", f_mode, (unsigned long)sbp->st_nlink, UT_NAMESIZE, user ? user : "", UT_GRPSIZE, group ? group : ""); diff --git a/archivers/pax/files/tar.c b/archivers/pax/files/tar.c index e9029cf8987..4b6be78ada0 100644 --- a/archivers/pax/files/tar.c +++ b/archivers/pax/files/tar.c @@ -1,4 +1,4 @@ -/* $NetBSD: tar.c,v 1.2 2003/06/23 13:45:07 grant Exp $ */ +/* $NetBSD: tar.c,v 1.3 2003/06/24 06:45:00 grant Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -47,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: tar.c,v 1.2 2003/06/23 13:45:07 grant Exp $"); +__RCSID("$NetBSD: tar.c,v 1.3 2003/06/24 06:45:00 grant Exp $"); #endif #endif /* not lint */ @@ -1158,8 +1158,8 @@ ustar_wr(ARCHD *arcn) ul_oct((u_long)arcn->sb.st_gid, hd->gid, sizeof(hd->gid), 3) || ul_oct((u_long)arcn->sb.st_mtime,hd->mtime,sizeof(hd->mtime),3)) goto out; - user = user_from_uid(arcn->sb.st_uid, 1); - group = group_from_gid(arcn->sb.st_gid, 1); + user = (char *)user_from_uid(arcn->sb.st_uid, 1); + group = (char *)group_from_gid(arcn->sb.st_gid, 1); strncpy(hd->uname, user ? user : "", sizeof(hd->uname)); strncpy(hd->gname, group ? group : "", sizeof(hd->gname)); |