X-Git-Url: https://git.saurik.com/apple/file_cmds.git/blobdiff_plain/440bd1982b8e55068af44543d97888092d61feee..39aaa94bf0a1c68b3fe15e3622c96766f0f22ff2:/mtree/create.c diff --git a/mtree/create.c b/mtree/create.c index f755acc..66992a7 100644 --- a/mtree/create.c +++ b/mtree/create.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,13 +27,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; -#endif -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/mtree/create.c,v 1.18.2.3 2001/01/12 19:17:18 phk Exp $"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/usr.sbin/mtree/create.c,v 1.37 2005/03/29 11:44:17 tobez Exp $"); #include #include @@ -47,16 +43,22 @@ static const char rcsid[] = #include #include #include -#ifdef MD5 +#ifndef __APPLE__ +#ifdef ENABLE_MD5 #include #endif -#ifdef SHA1 +#ifdef ENABLE_SHA1 #include #endif -#ifdef RMD160 +#ifdef ENABLE_RMD160 #include #endif +#ifdef ENABLE_SHA256 +#include +#endif +#endif /* !__APPLE__ */ #include +#include #include #include #include @@ -64,46 +66,51 @@ static const char rcsid[] = #include "mtree.h" #include "extern.h" +#ifdef __APPLE__ +#include "commoncrypto.h" +#endif /* __APPLE__ */ + #define INDENTNAMELEN 15 #define MAXLINELEN 80 -extern long int crc_total; -extern int ftsoptions; -extern int dflag, iflag, nflag, sflag; -extern u_int keys; -extern char fullpath[MAXPATHLEN]; -extern int lineno; - static gid_t gid; static uid_t uid; static mode_t mode; static u_long flags = 0xffffffff; +static char *xattrs = kNone; +static char *acl = kNone; -static int dsort __P((const FTSENT **, const FTSENT **)); -static void output __P((int, int *, const char *, ...)); -static int statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, - u_long *)); -static void statf __P((int, FTSENT *)); +static int dsort(const FTSENT **, const FTSENT **); +static void output(int, int *, const char *, ...) __printflike(3, 4); +static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *, char **, char **); +static void statf(int, FTSENT *); void -cwalk() +cwalk(void) { - register FTS *t; - register FTSENT *p; - time_t clock; + FTS *t; + FTSENT *p; + time_t cl; char *argv[2], host[MAXHOSTNAMELEN]; + char dot[] = "."; int indent = 0; + char *path; - (void)time(&clock); - (void)gethostname(host, sizeof(host)); - (void)printf( - "#\t user: %s\n#\tmachine: %s\n#\t tree: %s\n#\t date: %s", - getlogin(), host, fullpath, ctime(&clock)); + if (!nflag) { + (void)time(&cl); + (void)gethostname(host, sizeof(host)); + (void)printf( + "#\t user: %s\n#\tmachine: %s\n", + getlogin(), host); + (void)printf( + "#\t tree: %s\n#\t date: %s", + fullpath, ctime(&cl)); + } - argv[0] = "."; + argv[0] = dot; argv[1] = NULL; if ((t = fts_open(argv, ftsoptions, dsort)) == NULL) - err(1, "line %d: fts_open", lineno); + err(1, "fts_open()"); while ((p = fts_read(t))) { if (iflag) indent = p->fts_level * 4; @@ -115,14 +122,20 @@ cwalk() case FTS_D: if (!dflag) (void)printf("\n"); - if (!nflag) - (void)printf("# %s\n", p->fts_path); - statd(t, p, &uid, &gid, &mode, &flags); + if (!nflag) { + path = escape_path(p->fts_path); + (void)printf("# %s\n", path); + free(path); + } + statd(t, p, &uid, &gid, &mode, &flags, &xattrs, &acl); statf(indent, p); break; case FTS_DP: - if (!nflag && (p->fts_level > 0)) - (void)printf("%*s# %s\n", indent, "", p->fts_path); + if (!nflag && (p->fts_level > 0)) { + path = escape_path(p->fts_path); + (void)printf("%*s# %s\n", indent, "", path); + free(path); + } (void)printf("%*s..\n", indent, ""); if (!dflag) (void)printf("\n"); @@ -141,17 +154,16 @@ cwalk() } (void)fts_close(t); if (sflag && keys & F_CKSUM) - warnx("%s checksum: %lu", fullpath, crc_total); + warnx("%s checksum: %lu", fullpath, (unsigned long)crc_total); } static void -statf(indent, p) - int indent; - FTSENT *p; +statf(int indent, FTSENT *p) { struct group *gr; struct passwd *pw; - u_long len, val; + uint32_t val; + off_t len; int fd, offset; char *fflags; char *escaped_name; @@ -159,13 +171,13 @@ statf(indent, p) escaped_name = calloc(1, p->fts_namelen * 4 + 1); if (escaped_name == NULL) errx(1, "statf(): calloc() failed"); - strvis(escaped_name, p->fts_name, VIS_WHITE | VIS_OCTAL); + strvis(escaped_name, p->fts_name, VIS_WHITE | VIS_OCTAL | VIS_GLOB); if (iflag || S_ISDIR(p->fts_statp->st_mode)) offset = printf("%*s%s", indent, "", escaped_name); else offset = printf("%*s %s", indent, "", escaped_name); - + free(escaped_name); if (offset > (INDENTNAMELEN + indent)) @@ -177,26 +189,32 @@ statf(indent, p) output(indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (p->fts_statp->st_uid != uid) { if (keys & F_UNAME) { - if ((pw = getpwuid(p->fts_statp->st_uid)) != NULL) { + pw = getpwuid(p->fts_statp->st_uid); + if (pw != NULL) output(indent, &offset, "uname=%s", pw->pw_name); - } else { + else if (wflag) + warnx("Could not get uname for uid=%u", + p->fts_statp->st_uid); + else errx(1, - "line %d: could not get uname for uid=%u", - lineno, p->fts_statp->st_uid); - } + "Could not get uname for uid=%u", + p->fts_statp->st_uid); } if (keys & F_UID) output(indent, &offset, "uid=%u", p->fts_statp->st_uid); } if (p->fts_statp->st_gid != gid) { if (keys & F_GNAME) { - if ((gr = getgrgid(p->fts_statp->st_gid)) != NULL) { + gr = getgrgid(p->fts_statp->st_gid); + if (gr != NULL) output(indent, &offset, "gname=%s", gr->gr_name); - } else { + else if (wflag) + warnx("Could not get gname for gid=%u", + p->fts_statp->st_gid); + else errx(1, - "line %d: could not get gname for gid=%u", - lineno, p->fts_statp->st_gid); - } + "Could not get gname for gid=%u", + p->fts_statp->st_gid); } if (keys & F_GID) output(indent, &offset, "gid=%u", p->fts_statp->st_gid); @@ -206,62 +224,118 @@ statf(indent, p) if (keys & F_NLINK && p->fts_statp->st_nlink != 1) output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink); if (keys & F_SIZE) - output(indent, &offset, "size=%qd", p->fts_statp->st_size); + output(indent, &offset, "size=%jd", + (intmax_t)p->fts_statp->st_size); if (keys & F_TIME) - output(indent, &offset, "time=%ld.%ld", - p->fts_statp->st_mtimespec.tv_sec, + output(indent, &offset, "time=%ld.%09ld", + (long)p->fts_statp->st_mtimespec.tv_sec, p->fts_statp->st_mtimespec.tv_nsec); if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) { if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 || crc(fd, &val, &len)) - err(1, "line %d: %s", lineno, p->fts_accpath); + err(1, "%s", p->fts_accpath); (void)close(fd); - output(indent, &offset, "cksum=%lu", val); + output(indent, &offset, "cksum=%lu", (unsigned long)val); } -#ifdef MD5 +#ifdef ENABLE_MD5 if (keys & F_MD5 && S_ISREG(p->fts_statp->st_mode)) { char *digest, buf[33]; digest = MD5File(p->fts_accpath, buf); - if (!digest) { - err(1, "line %d: %s", lineno, p->fts_accpath); - } else { - output(indent, &offset, "md5digest=%s", digest); - } + if (!digest) + err(1, "%s", p->fts_accpath); + output(indent, &offset, "md5digest=%s", digest); } -#endif /* MD5 */ -#ifdef SHA1 +#endif /* ENABLE_MD5 */ +#ifdef ENABLE_SHA1 if (keys & F_SHA1 && S_ISREG(p->fts_statp->st_mode)) { char *digest, buf[41]; digest = SHA1_File(p->fts_accpath, buf); - if (!digest) { - err(1, "line %d: %s", lineno, p->fts_accpath); - } else { - output(indent, &offset, "sha1digest=%s", digest); - } + if (!digest) + err(1, "%s", p->fts_accpath); + output(indent, &offset, "sha1digest=%s", digest); } -#endif /* SHA1 */ -#ifdef RMD160 +#endif /* ENABLE_SHA1 */ +#ifdef ENABLE_RMD160 if (keys & F_RMD160 && S_ISREG(p->fts_statp->st_mode)) { char *digest, buf[41]; digest = RIPEMD160_File(p->fts_accpath, buf); - if (!digest) { - err(1, "line %d: %s", lineno, p->fts_accpath); - } else { - output(indent, &offset, "ripemd160digest=%s", digest); - } + if (!digest) + err(1, "%s", p->fts_accpath); + output(indent, &offset, "ripemd160digest=%s", digest); + } +#endif /* ENABLE_RMD160 */ +#ifdef ENABLE_SHA256 + if (keys & F_SHA256 && S_ISREG(p->fts_statp->st_mode)) { + char *digest, buf[kSHA256NullTerminatedBuffLen]; + + digest = SHA256_File(p->fts_accpath, buf); + if (!digest) + err(1, "%s", p->fts_accpath); + output(indent, &offset, "sha256digest=%s", digest); } -#endif /* RMD160 */ +#endif /* ENABLE_SHA256 */ if (keys & F_SLINK && - (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) - output(indent, &offset, "link=%s", rlink(p->fts_accpath)); + (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { + char visbuf[MAXPATHLEN * 4]; + char *s = rlink(p->fts_accpath); + strvis(visbuf, s, VIS_WHITE | VIS_OCTAL); + output(indent, &offset, "link=%s", visbuf); + } if (keys & F_FLAGS && p->fts_statp->st_flags != flags) { fflags = flags_to_string(p->fts_statp->st_flags); output(indent, &offset, "flags=%s", fflags); free(fflags); } + if (keys & F_BTIME) { + output(indent, &offset, "btime=%ld.%09ld", + p->fts_statp->st_birthtimespec.tv_sec, + p->fts_statp->st_birthtimespec.tv_nsec); + } + // only check access time on regular files, as traversing a folder will update its access time + if (keys & F_ATIME && S_ISREG(p->fts_statp->st_mode)) { + output(indent, &offset, "atime=%ld.%09ld", + p->fts_statp->st_atimespec.tv_sec, + p->fts_statp->st_atimespec.tv_nsec); + } + if (keys & F_CTIME) { + output(indent, &offset, "ctime=%ld.%09ld", + p->fts_statp->st_ctimespec.tv_sec, + p->fts_statp->st_ctimespec.tv_nsec); + } + // date added to parent folder is only supported for files and directories + if (keys & F_PTIME && (S_ISREG(p->fts_statp->st_mode) || + S_ISDIR(p->fts_statp->st_mode))) { + int supported; + struct timespec ptimespec = ptime(p->fts_accpath, &supported); + if (supported) { + output(indent, &offset, "ptime=%ld.%09ld", + ptimespec.tv_sec, + ptimespec.tv_nsec); + } + } + if (keys & F_XATTRS) { + char *digest, buf[kSHA256NullTerminatedBuffLen]; + + digest = SHA256_Path_XATTRs(p->fts_accpath, buf); + if (digest && (strcmp(digest, xattrs) != 0)) { + output(indent, &offset, "xattrsdigest=%s", digest); + } + } + if (keys & F_INODE) { + output(indent, &offset, "inode=%llu", p->fts_statp->st_ino); + } + if (keys & F_ACL) { + char *digest, buf[kSHA256NullTerminatedBuffLen]; + + digest = SHA256_Path_ACL(p->fts_accpath, buf); + if (digest && (strcmp(digest, acl) != 0)) { + output(indent, &offset, "acldigest=%s", digest); + } + } + (void)putchar('\n'); } @@ -272,25 +346,21 @@ statf(indent, p) #define MAXS 16 static int -statd(t, parent, puid, pgid, pmode, pflags) - FTS *t; - FTSENT *parent; - uid_t *puid; - gid_t *pgid; - mode_t *pmode; - u_long *pflags; +statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode, u_long *pflags, char **pxattrs, char **pacl) { - register FTSENT *p; - register gid_t sgid; - register uid_t suid; - register mode_t smode; - register u_long sflags; + FTSENT *p; + gid_t sgid; + uid_t suid; + mode_t smode; + u_long sflags; struct group *gr; struct passwd *pw; gid_t savegid = *pgid; uid_t saveuid = *puid; mode_t savemode = *pmode; u_long saveflags = *pflags; + char *savexattrs = *pxattrs; + char *saveacl = *pacl; u_short maxgid, maxuid, maxmode, maxflags; u_short g[MAXGID], u[MAXUID], m[MAXMODE], f[MAXFLAGS]; char *fflags; @@ -298,7 +368,7 @@ statd(t, parent, puid, pgid, pmode, pflags) if ((p = fts_children(t, 0)) == NULL) { if (errno) - err(1, "line %d: %s", lineno, RP(parent)); + err(1, "%s", RP(parent)); return (1); } @@ -325,6 +395,12 @@ statd(t, parent, puid, pgid, pmode, pflags) saveuid = suid; maxuid = u[suid]; } + + /* + * XXX + * note that we don't count the most common xattr/acl digest + * so set will always the default value (none) + */ /* * XXX @@ -348,7 +424,7 @@ statd(t, parent, puid, pgid, pmode, pflags) */ if ((((keys & F_UNAME) | (keys & F_UID)) && (*puid != saveuid)) || (((keys & F_GNAME) | (keys & F_GID)) && (*pgid != savegid)) || - ((keys & F_MODE) && (*pmode != savemode)) || + ((keys & F_MODE) && (*pmode != savemode)) || ((keys & F_FLAGS) && (*pflags != saveflags)) || (first)) { first = 0; @@ -357,22 +433,24 @@ statd(t, parent, puid, pgid, pmode, pflags) else (void)printf("/set type=file"); if (keys & F_UNAME) { - if ((pw = getpwuid(saveuid)) != NULL) + pw = getpwuid(saveuid); + if (pw != NULL) (void)printf(" uname=%s", pw->pw_name); + else if (wflag) + warnx( "Could not get uname for uid=%u", saveuid); else - errx(1, - "line %d: could not get uname for uid=%u", - lineno, saveuid); + errx(1, "Could not get uname for uid=%u", saveuid); } if (keys & F_UID) (void)printf(" uid=%lu", (u_long)saveuid); if (keys & F_GNAME) { - if ((gr = getgrgid(savegid)) != NULL) + gr = getgrgid(savegid); + if (gr != NULL) (void)printf(" gname=%s", gr->gr_name); + else if (wflag) + warnx("Could not get gname for gid=%u", savegid); else - errx(1, - "line %d: could not get gname for gid=%u", - lineno, savegid); + errx(1, "Could not get gname for gid=%u", savegid); } if (keys & F_GID) (void)printf(" gid=%lu", (u_long)savegid); @@ -385,18 +463,23 @@ statd(t, parent, puid, pgid, pmode, pflags) (void)printf(" flags=%s", fflags); free(fflags); } + if (keys & F_XATTRS) + (void)printf(" xattrsdigest=%s", savexattrs); + if (keys & F_ACL) + (void)printf(" acldigest=%s", saveacl); (void)printf("\n"); *puid = saveuid; *pgid = savegid; *pmode = savemode; *pflags = saveflags; + *pxattrs = savexattrs; + *pacl = saveacl; } return (0); } static int -dsort(a, b) - const FTSENT **a, **b; +dsort(const FTSENT **a, const FTSENT **b) { if (S_ISDIR((*a)->fts_statp->st_mode)) { if (!S_ISDIR((*b)->fts_statp->st_mode)) @@ -406,30 +489,14 @@ dsort(a, b) return (strcmp((*a)->fts_name, (*b)->fts_name)); } -#if __STDC__ #include -#else -#include -#endif void -#if __STDC__ output(int indent, int *offset, const char *fmt, ...) -#else -output(indent, offset, fmt, va_alist) - int indent; - int *offset; - char *fmt; - va_dcl -#endif { va_list ap; char buf[1024]; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap);