Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change metadata_log() to support logging symlink info as well

Browse Source 
(including target name).  pointed out by perry.
This commit is contained in:
lukem 2001-10-29 02:57:21 +00:00
parent 163e969b09
commit 01381cc6c0
1 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
usr.bin/xinstall/xinstall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xinstall.c,v 1.56 2001/10/29 00:25:44 perry Exp $ */ /* $NetBSD: xinstall.c,v 1.57 2001/10/29 02:57:21 lukem Exp $ */
/* /*
* Copyright (c) 1987, 1993 * Copyright (c) 1987, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#else #else
__RCSID("$NetBSD: xinstall.c,v 1.56 2001/10/29 00:25:44 perry Exp $"); __RCSID("$NetBSD: xinstall.c,v 1.57 2001/10/29 02:57:21 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -98,13 +98,14 @@ char *suffix = BACKUP_SUFFIX;
void backup(const char *); void backup(const char *);
void copy(int, char *, int, char *, off_t); void copy(int, char *, int, char *, off_t);
const char *inotype(u_int);
void install(char *, char *, u_int); void install(char *, char *, u_int);
void install_dir(char *, u_int); void install_dir(char *, u_int);
int main(int, char *[]); int main(int, char *[]);
void makelink(char *, char *); void makelink(char *, char *);
int parseid(char *, id_t *); int parseid(char *, id_t *);
void strip(char *); void strip(char *);
void metadata_log(const char *, mode_t, u_int, struct timeval *); void metadata_log(const char *, mode_t, struct timeval *, const char *);
void usage(void); void usage(void);
int int
@ -337,8 +338,10 @@ makelink(char *from_name, char *to_name)
if ((dolink & LN_HARD) || errno != EXDEV) if ((dolink & LN_HARD) || errno != EXDEV)
err(1, "link %s -> %s", from_name, to_name); err(1, "link %s -> %s", from_name, to_name);
} }
else else {
/* XXX: need to log hard link metadata ? */
return; return;
}
} }
/* Symbolic links */ /* Symbolic links */
@ -348,6 +351,7 @@ makelink(char *from_name, char *to_name)
err(1, "%s", src); err(1, "%s", src);
if (symlink(src, to_name) == -1) if (symlink(src, to_name) == -1)
err(1, "symlink %s -> %s", src, to_name); err(1, "symlink %s -> %s", src, to_name);
metadata_log(to_name, S_IFLNK, NULL, src);
return; return;
} }
@ -375,6 +379,7 @@ makelink(char *from_name, char *to_name)
if (symlink(lnk, dst) == -1) if (symlink(lnk, dst) == -1)
err(1, "symlink %s -> %s", lnk, dst); err(1, "symlink %s -> %s", lnk, dst);
metadata_log(dst, S_IFLNK, NULL, lnk);
return; return;
} }
@ -384,7 +389,7 @@ makelink(char *from_name, char *to_name)
*/ */
if (symlink(from_name, to_name) == -1) if (symlink(from_name, to_name) == -1)
err(1, "symlink %s -> %s", from_name, to_name); err(1, "symlink %s -> %s", from_name, to_name);
metadata_log(to_name, S_IFLNK, NULL, from_name);
} }
/* /*
@ -543,7 +548,7 @@ install(char *from_name, char *to_name, u_int flags)
warn("%s: chflags", to_name); warn("%s: chflags", to_name);
} }
metadata_log(to_name, S_IFREG, flags, dopreserve ? tv : NULL); metadata_log(to_name, S_IFREG, tv, NULL);
} }
/* /*
@ -715,7 +720,32 @@ install_dir(char *path, u_int flags)
|| chmod(path, mode) == -1 )) { || chmod(path, mode) == -1 )) {
warn("%s", path); warn("%s", path);
} }
metadata_log(path, S_IFDIR, flags & ~SETFLAGS, NULL); metadata_log(path, S_IFDIR, NULL, NULL);
}
const char *
inotype(u_int type)
{
switch (type & S_IFMT) {
case S_IFBLK:
return ("block");
case S_IFCHR:
return ("char");
case S_IFDIR:
return ("dir");
case S_IFIFO:
return ("fifo");
case S_IFREG:
return ("file");
case S_IFLNK:
return ("link");
case S_IFSOCK:
return ("socket");
default:
return ("unknown");
}
/* NOTREACHED */
} }
/* /*
@ -724,7 +754,8 @@ install_dir(char *path, u_int flags)
* metafp, to allow permissions to be set correctly by other tools. * metafp, to allow permissions to be set correctly by other tools.
*/ */
void void
metadata_log(const char *path, mode_t type, u_int flags, struct timeval *tv) metadata_log(const char *path, mode_t type, struct timeval *tv,
const char *link)
{ {
const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' };
char *buf; char *buf;
@ -743,8 +774,9 @@ metadata_log(const char *path, mode_t type, u_int flags, struct timeval *tv)
strsvis(buf, path, VIS_CSTYLE, extra); /* encode name */ strsvis(buf, path, VIS_CSTYLE, extra); /* encode name */
fprintf(metafp, ".%s%s type=%s mode=%#o", /* print details */ fprintf(metafp, ".%s%s type=%s mode=%#o", /* print details */
buf[0] == '/' ? "" : "/", buf, buf[0] == '/' ? "" : "/", buf, inotype(type), mode);
S_ISDIR(type) ? "dir" : "file", mode); if (link)
fprintf(metafp, " link=%s", link);
if (owner) if (owner)
fprintf(metafp, " uname=%s", owner); fprintf(metafp, " uname=%s", owner);
if (group) if (group)
@ -753,7 +785,7 @@ metadata_log(const char *path, mode_t type, u_int flags, struct timeval *tv)
fprintf(metafp, " flags=%s", fflags); fprintf(metafp, " flags=%s", fflags);
if (tags) if (tags)
fprintf(metafp, " tags=%s", tags); fprintf(metafp, " tags=%s", tags);
if (tv != NULL) if (tv != NULL && dopreserve)
fprintf(metafp, " time=%ld.%ld", tv[1].tv_sec, tv[1].tv_usec); fprintf(metafp, " time=%ld.%ld", tv[1].tv_sec, tv[1].tv_usec);
fputc('\n', metafp); fputc('\n', metafp);
fflush(metafp); /* flush output */ fflush(metafp); /* flush output */