* Ported to Linux's Second Extended File System as part of the
* dump and restore backup suit
* Remy Card <card@Linux.EU.Org>, 1994-1997
- * Stelian Pop <pop@cybercable.fr>, 1999
- *
+ * Stelian Pop <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
*/
/*
* 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.
*
*/
#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95";
-#endif
static const char rcsid[] =
- "$Id: dirs.c,v 1.2 1999/10/11 12:53:23 stelian Exp $";
+ "$Id: dirs.c,v 1.31 2005/01/24 10:32:14 stelian Exp $";
#endif /* not lint */
+#include <config.h>
+#include <compatlfs.h>
+#include <sys/types.h>
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
#ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
#include <bsdcompat.h>
#else /* __linux__ */
+#ifdef sunos
+#include <sys/fcntl.h>
+#include <bsdcompat.h>
+#else
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h>
+#endif
#endif /* __linux__ */
#include <protocols/dumprestore.h>
-#include <err.h>
+#include <compaterr.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef __linux__
#include <endian.h>
#else
+#ifdef sunos
+#include <arpa/nameser_compat.h>
+#else
#include <machine/endian.h>
#endif
+#endif
#include "pathnames.h"
#include "restore.h"
#define INOHASH(val) (val % HASHSIZE)
struct inotab {
struct inotab *t_next;
- ino_t t_ino;
- int32_t t_seekpt;
- int32_t t_size;
+ dump_ino_t t_ino;
+ OFF_T t_seekpt;
+ OFF_T t_size;
};
static struct inotab *inotab[HASHSIZE];
* Information retained about directories.
*/
struct modeinfo {
- ino_t ino;
+ dump_ino_t ino;
struct timeval timep[2];
mode_t mode;
uid_t uid;
gid_t gid;
- int flags;
+ unsigned int flags;
};
/*
/*
* Global variables for this file.
*/
-static long seekpt;
+static OFF_T seekpt;
static FILE *df, *mf;
static RST_DIR *dirp;
static char dirfile[MAXPATHLEN] = "#"; /* No file */
char d_name[ODIRSIZ];
};
-#ifdef __linux__
-static struct inotab *allocinotab __P((ino_t, struct new_bsd_inode *, long));
+#if defined(__linux__) || defined(sunos)
+static struct inotab *allocinotab __P((dump_ino_t, OFF_T));
+static void savemodeinfo __P((dump_ino_t, struct new_bsd_inode *));
#else
-static struct inotab *allocinotab __P((ino_t, struct dinode *, long));
+static struct inotab *allocinotab __P((dump_ino_t, OFF_T));
+static void savemodeinfo __P((dump_ino_t, struct dinode *));
#endif
static void dcvt __P((struct odirect *, struct direct *));
static void flushent __P((void));
-static struct inotab *inotablookup __P((ino_t));
+static struct inotab *inotablookup __P((dump_ino_t));
static RST_DIR *opendirfile __P((const char *));
-static void putdir __P((char *, long));
+static void putdir __P((char *, size_t));
static void putent __P((struct direct *));
-static void rst_seekdir __P((RST_DIR *, long, long));
-static long rst_telldir __P((RST_DIR *));
-static struct direct *searchdir __P((ino_t, char *));
+static void rst_seekdir __P((RST_DIR *, OFF_T, OFF_T));
+static OFF_T rst_telldir __P((RST_DIR *));
+static struct direct *searchdir __P((dump_ino_t, char *));
+
+#ifdef sunos
+extern int fdsmtc;
+#endif
/*
* Extract directory contents, building up a directory structure
* directories on the tape.
*/
void
-extractdirs(genmode)
- int genmode;
+extractdirs(int genmode)
{
- register int i;
-#ifdef __linux__
- register struct new_bsd_inode *ip;
+ int i;
+#if defined(__linux__) || defined(sunos)
+ struct new_bsd_inode ip;
#else
- register struct dinode *ip;
+ struct dinode ip;
#endif
struct inotab *itp;
struct direct nulldir;
int fd;
+ dump_ino_t ino;
- vprintf(stdout, "Extract directories from tape\n");
- (void) sprintf(dirfile, "%s/rstdir%ld", tmpdir, dumpdate);
+ Vprintf(stdout, "Extract directories from tape\n");
+ (void) snprintf(dirfile, sizeof(dirfile), "%s/rstdir%ld", tmpdir,
+ (long)dumpdate);
if (command != 'r' && command != 'R') {
- (void *) strcat(dirfile, "-XXXXXX");
- fd = mkstemp(dirfile);
+ (void) strncat(dirfile, "-XXXXXX",
+ sizeof(dirfile) - strlen(dirfile));
+ fd = MKSTEMP(dirfile);
} else
- fd = open(dirfile, O_RDWR|O_CREAT|O_EXCL, 0666);
+ fd = OPEN(dirfile, O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1 || (df = fdopen(fd, "w")) == NULL) {
if (fd != -1)
close(fd);
- warn("%s - cannot create directory temporary\nfopen", dirfile);
- done(1);
+ err(1, "cannot create directory temporary %s", dirfile);
}
if (genmode != 0) {
- (void) sprintf(modefile, "%s/rstmode%ld", tmpdir, dumpdate);
+ (void) snprintf(modefile, sizeof(modefile), "%s/rstmode%ld", tmpdir, (long)dumpdate);
if (command != 'r' && command != 'R') {
- (void *) strcat(modefile, "-XXXXXX");
- fd = mkstemp(modefile);
+ (void) strncat(modefile, "-XXXXXX",
+ sizeof(modefile) - strlen(modefile));
+ fd = MKSTEMP(modefile);
} else
- fd = open(modefile, O_RDWR|O_CREAT|O_EXCL, 0666);
+ fd = OPEN(modefile, O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) {
if (fd != -1)
close(fd);
- warn("%s - cannot create modefile\nfopen", modefile);
- done(1);
+ err(1, "cannot create modefile %s", modefile);
}
}
nulldir.d_ino = 0;
nulldir.d_type = DT_DIR;
nulldir.d_namlen = 1;
- (void) strcpy(nulldir.d_name, "/");
+ nulldir.d_name[0] = '/';
+ nulldir.d_name[1] = '\0';
nulldir.d_reclen = DIRSIZ(0, &nulldir);
for (;;) {
curfile.name = "<directory file - name unknown>";
curfile.action = USING;
- ip = curfile.dip;
- if (ip == NULL || (ip->di_mode & IFMT) != IFDIR) {
- (void) fclose(df);
+ ino = curfile.ino;
+ if (curfile.dip == NULL || (curfile.dip->di_mode & IFMT) != IFDIR) {
+ if ( fclose(df) == EOF )
+ err(1, "cannot write to file %s", dirfile);
dirp = opendirfile(dirfile);
if (dirp == NULL)
- fprintf(stderr, "opendirfile: %s\n",
- strerror(errno));
- if (mf != NULL)
- (void) fclose(mf);
+ warn("opendirfile");
+ if (mf != NULL && fclose(mf) == EOF )
+ err(1, "cannot write to file %s", dirfile);
i = dirlookup(dot);
if (i == 0)
panic("Root directory is not on tape\n");
return;
}
- itp = allocinotab(curfile.ino, ip, seekpt);
+ memcpy(&ip, curfile.dip, sizeof(ip));
+ itp = allocinotab(ino, seekpt);
getfile(putdir, xtrnull);
+ while (spcl.c_flags & DR_EXTATTRIBUTES) {
+ switch (spcl.c_extattributes) {
+ case EXT_MACOSFNDRINFO:
+ msg("MacOSX attributes not supported, skipping\n");
+ skipfile();
+ break;
+ case EXT_MACOSRESFORK:
+ msg("MacOSX attributes not supported, skipping\n");
+ skipfile();
+ break;
+ case EXT_XATTR:
+ msg("EA/ACLs attributes not supported, skipping\n");
+ skipfile();
+ break;
+ }
+ }
+ savemodeinfo(ino, &ip);
putent(&nulldir);
flushent();
itp->t_size = seekpt - itp->t_seekpt;
* skip over all the directories on the tape
*/
void
-skipdirs()
+skipdirs(void)
{
while (curfile.dip && (curfile.dip->di_mode & IFMT) == IFDIR) {
* pname and pass them off to be processed.
*/
void
-treescan(pname, ino, todo)
- char *pname;
- ino_t ino;
- long (*todo) __P((char *, ino_t, int));
+treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)))
{
- register struct inotab *itp;
- register struct direct *dp;
+ struct inotab *itp;
+ struct direct *dp;
int namelen;
- long bpt;
+ OFF_T bpt;
char locname[MAXPATHLEN + 1];
itp = inotablookup(ino);
* begin search through the directory
* skipping over "." and ".."
*/
- (void) strncpy(locname, pname, sizeof(locname) - 1);
- locname[sizeof(locname) - 1] = '\0';
- (void) strncat(locname, "/", sizeof(locname) - strlen(locname));
- namelen = strlen(locname);
+ namelen = snprintf(locname, sizeof(locname), "%s/", pname);
+ if (namelen >= (int)sizeof(locname))
+ namelen = sizeof(locname) - 1;
rst_seekdir(dirp, itp->t_seekpt, itp->t_seekpt);
dp = rst_readdir(dirp); /* "." */
if (dp != NULL && strcmp(dp->d_name, ".") == 0)
*/
while (dp != NULL) {
locname[namelen] = '\0';
- if (namelen + dp->d_namlen >= sizeof(locname)) {
- fprintf(stderr, "%s%s: name exceeds %d char\n",
- locname, dp->d_name, sizeof(locname) - 1);
+ if (namelen + dp->d_namlen >= (int)sizeof(locname)) {
+ fprintf(stderr, "%s%s: name exceeds %ld char\n",
+ locname, dp->d_name, (long)sizeof(locname) - 1);
} else {
(void) strncat(locname, dp->d_name, (int)dp->d_namlen);
treescan(locname, dp->d_ino, todo);
* Lookup a pathname which is always assumed to start from the ROOTINO.
*/
struct direct *
-pathsearch(pathname)
- const char *pathname;
+pathsearch(const char *pathname)
{
- ino_t ino;
+ dump_ino_t ino;
struct direct *dp;
char *path, *name, buffer[MAXPATHLEN];
while (*path == '/')
path++;
dp = NULL;
- while ((name = strsep(&path, "/")) != NULL && *name != '\0') {
+#ifdef __linux__
+ while ((name = strsep(&path, "/")) != NULL && *name /* != NULL */) {
+#else
+ while ((name = strtok_r(NULL, "/", &path)) != NULL && *name /* != NULL */) {
+#endif
if ((dp = searchdir(ino, name)) == NULL)
return (NULL);
ino = dp->d_ino;
* Return its inode number if found, zero if it does not exist.
*/
static struct direct *
-searchdir(inum, name)
- ino_t inum;
- char *name;
+searchdir(dump_ino_t inum, char *name)
{
- register struct direct *dp;
- register struct inotab *itp;
+ struct direct *dp;
+ struct inotab *itp;
int len;
itp = inotablookup(inum);
* Put the directory entries in the directory file
*/
static void
-putdir(buf, size)
- char *buf;
- long size;
+putdir(char *buf, size_t size)
{
struct direct cvtbuf;
- register struct odirect *odp;
+ struct odirect *odp;
struct odirect *eodp;
- register struct direct *dp;
+ struct direct *dp;
long loc, i;
- if (cvtflag) {
+ if (cvtflag && !ufs2flag) {
eodp = (struct odirect *)&buf[size];
for (odp = (struct odirect *)buf; odp < eodp; odp++)
if (odp->d_ino != 0) {
putent(&cvtbuf);
}
} else {
- for (loc = 0; loc < size; ) {
+ for (loc = 0; loc < (long)size; ) {
dp = (struct direct *)(buf + loc);
#ifdef DIRDEBUG
printf ("reclen = %d, namlen = %d, type = %d\n",
dp->d_reclen, dp->d_namlen, dp->d_type);
#endif
if (Bcvt)
- swabst((u_char *)"ls", (u_char *) dp);
+ swabst((u_char *)"is", (u_char *) dp);
if (oldinofmt && dp->d_ino != 0) {
-#ifdef __linux__
- if (Bcvt)
- swabst((u_char *)"s", (u_char *)&dp->d_namlen);
-#else
# if BYTE_ORDER == BIG_ENDIAN
if (Bcvt)
dp->d_namlen = dp->d_type;
if (!Bcvt)
dp->d_namlen = dp->d_type;
# endif
-#endif /* __linux__ */
+ if (dp->d_namlen == 0 && dp->d_type != 0)
+ dp->d_namlen = dp->d_type;
dp->d_type = DT_UNKNOWN;
}
-#ifdef __linux__
- /*
- * Horrible hack to read FreeBSD 2.0 dumps
- */
- if (!oldinofmt)
- swabst((u_char *)"6bs", (u_char *) dp);
-#endif /* __linux__ */
#ifdef DIRDEBUG
printf ("reclen = %d, namlen = %d, type = %d\n",
dp->d_reclen, dp->d_namlen, dp->d_type);
i = DIRBLKSIZ - (loc & (DIRBLKSIZ - 1));
if ((dp->d_reclen & 0x3) != 0 ||
dp->d_reclen > i ||
- dp->d_reclen < DIRSIZ(0, dp) ||
- dp->d_namlen > NAME_MAX) {
- vprintf(stdout, "Mangled directory: ");
+ dp->d_reclen < DIRSIZ(0, dp)
+#if MAXNAMLEN < 255
+ || dp->d_namlen > MAXNAMLEN
+#endif
+ ) {
+ Vprintf(stdout, "Mangled directory: ");
if ((dp->d_reclen & 0x3) != 0)
- vprintf(stdout,
+ Vprintf(stdout,
"reclen not multiple of 4 ");
if (dp->d_reclen < DIRSIZ(0, dp))
- vprintf(stdout,
+ Vprintf(stdout,
"reclen less than DIRSIZ (%d < %d) ",
dp->d_reclen, DIRSIZ(0, dp));
- if (dp->d_namlen > NAME_MAX)
- vprintf(stdout,
+#if MAXNAMLEN < 255
+ if (dp->d_namlen > MAXNAMLEN)
+ Vprintf(stdout,
"reclen name too big (%d > %d) ",
- dp->d_namlen, NAME_MAX);
- vprintf(stdout, "\n");
+ dp->d_namlen, MAXNAMLEN);
+#endif
+ Vprintf(stdout, "\n");
loc += i;
continue;
}
/*
* These variables are "local" to the following two functions.
*/
-char dirbuf[DIRBLKSIZ];
-long dirloc = 0;
-long prev = 0;
+static char dirbuf[DIRBLKSIZ];
+static long dirloc = 0;
+static long prev = 0;
/*
* add a new directory entry to a file.
*/
static void
-putent(dp)
- struct direct *dp;
+putent(struct direct *dp)
{
dp->d_reclen = DIRSIZ(0, dp);
if (dirloc + dp->d_reclen > DIRBLKSIZ) {
((struct direct *)(dirbuf + prev))->d_reclen =
DIRBLKSIZ - prev;
- (void) fwrite(dirbuf, 1, DIRBLKSIZ, df);
+ if ( fwrite(dirbuf, 1, DIRBLKSIZ, df) != DIRBLKSIZ )
+ err(1,"cannot write to file %s", dirfile);
dirloc = 0;
}
- memmove(dirbuf + dirloc, dp, (long)dp->d_reclen);
+ memmove(dirbuf + dirloc, dp, (size_t)dp->d_reclen);
prev = dirloc;
dirloc += dp->d_reclen;
}
* flush out a directory that is finished.
*/
static void
-flushent()
+flushent(void)
{
((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev;
- (void) fwrite(dirbuf, (int)dirloc, 1, df);
- seekpt = ftell(df);
+ if ( fwrite(dirbuf, (int)dirloc, 1, df) != 1 )
+ err(1, "cannot write to file %s", dirfile);
+ seekpt = FTELL(df);
+ if (seekpt == -1)
+ err(1, "cannot write to file %s", dirfile);
dirloc = 0;
}
static void
-dcvt(odp, ndp)
- register struct odirect *odp;
- register struct direct *ndp;
+dcvt(struct odirect *odp, struct direct *ndp)
{
- memset(ndp, 0, (long)(sizeof *ndp));
+ memset(ndp, 0, (size_t)(sizeof *ndp));
ndp->d_ino = odp->d_ino;
ndp->d_type = DT_UNKNOWN;
(void) strncpy(ndp->d_name, odp->d_name, ODIRSIZ);
* the desired seek offset into it.
*/
static void
-rst_seekdir(dirp, loc, base)
- register RST_DIR *dirp;
- long loc, base;
+rst_seekdir(RST_DIR *dirp, OFF_T loc, OFF_T base)
{
if (loc == rst_telldir(dirp))
return;
loc -= base;
if (loc < 0)
- fprintf(stderr, "bad seek pointer to rst_seekdir %ld\n", loc);
- (void) lseek(dirp->dd_fd, base + (loc & ~(DIRBLKSIZ - 1)), SEEK_SET);
+ fprintf(stderr, "bad seek pointer to rst_seekdir %lld\n", (long long int)loc);
+ (void) LSEEK(dirp->dd_fd, base + (loc & ~(DIRBLKSIZ - 1)), SEEK_SET);
dirp->dd_loc = loc & (DIRBLKSIZ - 1);
if (dirp->dd_loc != 0)
dirp->dd_size = read(dirp->dd_fd, dirp->dd_buf, DIRBLKSIZ);
* get next entry in a directory.
*/
struct direct *
-rst_readdir(dirp)
- register RST_DIR *dirp;
+rst_readdir(RST_DIR *dirp)
{
- register struct direct *dp;
+ struct direct *dp;
for (;;) {
if (dirp->dd_loc == 0) {
dirp->dd_size = read(dirp->dd_fd, dirp->dd_buf,
DIRBLKSIZ);
if (dirp->dd_size <= 0) {
- dprintf(stderr, "error reading directory\n");
+ Dprintf(stderr, "error reading directory\n");
return (NULL);
}
}
dp = (struct direct *)(dirp->dd_buf + dirp->dd_loc);
if (dp->d_reclen == 0 ||
dp->d_reclen > DIRBLKSIZ + 1 - dirp->dd_loc) {
- dprintf(stderr, "corrupted directory: bad reclen %d\n",
+ Dprintf(stderr, "corrupted directory: bad reclen %d\n",
dp->d_reclen);
return (NULL);
}
if (dp->d_ino == 0 && strcmp(dp->d_name, "/") == 0)
return (NULL);
if (dp->d_ino >= maxino) {
- dprintf(stderr, "corrupted directory: bad inum %d\n",
+ Dprintf(stderr, "corrupted directory: bad inum %d\n",
dp->d_ino);
continue;
}
* Simulate the opening of a directory
*/
RST_DIR *
-rst_opendir(name)
- const char *name;
+rst_opendir(const char *name)
{
struct inotab *itp;
RST_DIR *dirp;
- ino_t ino;
+ dump_ino_t ino;
if ((ino = dirlookup(name)) > 0 &&
(itp = inotablookup(ino)) != NULL) {
* In our case, there is nothing to do when closing a directory.
*/
void
-rst_closedir(dirp)
- RST_DIR *dirp;
+rst_closedir(RST_DIR *dirp)
{
(void)close(dirp->dd_fd);
/*
* Simulate finding the current offset in the directory.
*/
-static long
-rst_telldir(dirp)
- RST_DIR *dirp;
+static OFF_T
+rst_telldir(RST_DIR *dirp)
{
- return ((long)lseek(dirp->dd_fd,
- (off_t)0, SEEK_CUR) - dirp->dd_size + dirp->dd_loc);
+ return ((OFF_T)LSEEK(dirp->dd_fd,
+ (OFF_T)0, SEEK_CUR) - dirp->dd_size + dirp->dd_loc);
}
/*
* Open a directory file.
*/
static RST_DIR *
-opendirfile(name)
- const char *name;
+opendirfile(const char *name)
{
- register RST_DIR *dirp;
- register int fd;
+ RST_DIR *dirp;
+ int fd;
- if ((fd = open(name, O_RDONLY)) == -1)
+ if ((fd = OPEN(name, O_RDONLY)) == -1)
return (NULL);
if ((dirp = malloc(sizeof(RST_DIR))) == NULL) {
(void)close(fd);
* Set the mode, owner, and times for all new or changed directories
*/
void
-setdirmodes(flags)
- int flags;
+setdirmodes(int flags)
{
FILE *mf;
struct modeinfo node;
struct entry *ep;
char *cp;
- vprintf(stdout, "Set directory mode, owner, and times.\n");
+ Vprintf(stdout, "Set directory mode, owner, and times.\n");
if (command == 'r' || command == 'R')
- (void) sprintf(modefile, "%s/rstmode%ld", tmpdir, dumpdate);
+ (void) snprintf(modefile, sizeof(modefile), "%s/rstmode%lu", tmpdir, (long)dumpdate);
if (modefile[0] == '#') {
panic("modefile not defined\n");
fprintf(stderr, "directory mode, owner, and times not set\n");
}
mf = fopen(modefile, "r");
if (mf == NULL) {
- fprintf(stderr, "fopen: %s\n", strerror(errno));
+ warn("fopen");
fprintf(stderr, "cannot open mode file %s\n", modefile);
fprintf(stderr, "directory mode, owner, and times not set\n");
return;
ep->e_flags &= ~NEW;
continue;
}
- if (node.ino == ROOTINO &&
+ if ((flags & FORCE) == 0 &&
+ node.ino == ROOTINO &&
reply("set owner/mode for '.'") == FAIL)
continue;
}
cp = myname(ep);
(void) chown(cp, node.uid, node.gid);
(void) chmod(cp, node.mode);
+ if (node.flags)
#ifdef __linux__
- (void) setflags(cp, node.flags);
+ (void) lsetflags(cp, node.flags);
+#else
+#ifdef sunos
#else
- (void) chflags(cp, node.flags);
+ (void) chflags(cp, node.flags);
+#endif
#endif
utimes(cp, node.timep);
ep->e_flags &= ~NEW;
(void) fclose(mf);
}
+/*
+ * In restore -C mode, tests the attributes for all directories
+ */
+void
+comparedirmodes(void)
+{
+ FILE *mf;
+ struct modeinfo node;
+ struct entry *ep;
+ char *cp;
+
+ Vprintf(stdout, "Compare directories modes, owner, attributes.\n");
+ if (modefile[0] == '#') {
+ panic("modefile not defined\n");
+ fprintf(stderr, "directory mode, owner, and times not set\n");
+ return;
+ }
+ mf = fopen(modefile, "r");
+ if (mf == NULL) {
+ warn("fopen");
+ fprintf(stderr, "cannot open mode file %s\n", modefile);
+ fprintf(stderr, "directory mode, owner, and times not set\n");
+ return;
+ }
+ clearerr(mf);
+ for (;;) {
+ (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf);
+ if (feof(mf))
+ break;
+ ep = lookupino(node.ino);
+ if (ep == NULL) {
+ panic("cannot find directory inode %d\n", node.ino);
+ } else {
+ cp = myname(ep);
+ struct STAT sb;
+ unsigned long newflags;
+
+ if (LSTAT(cp, &sb) < 0) {
+ warn("unable to stat %s", cp);
+ do_compare_error;
+ continue;
+ }
+
+ Vprintf(stdout, "comparing directory %s\n", cp);
+
+ if (sb.st_mode != node.mode) {
+ fprintf(stderr, "%s: mode changed from 0%o to 0%o.\n",
+ cp, node.mode & 07777, sb.st_mode & 07777);
+ do_compare_error;
+ }
+ if (sb.st_uid != node.uid) {
+ fprintf(stderr, "%s: uid changed from %d to %d.\n",
+ cp, node.uid, sb.st_uid);
+ do_compare_error;
+ }
+ if (sb.st_gid != node.gid) {
+ fprintf(stderr, "%s: gid changed from %d to %d.\n",
+ cp, node.gid, sb.st_gid);
+ do_compare_error;
+ }
+#ifdef __linux__
+ if (lgetflags(cp, &newflags) < 0) {
+ if (node.flags != 0) {
+ warn("%s: lgetflags failed", cp);
+ do_compare_error;
+ }
+ }
+ else {
+ if (newflags != node.flags) {
+ fprintf(stderr, "%s: flags changed from 0x%08x to 0x%08lx.\n",
+ cp, node.flags, newflags);
+ do_compare_error;
+ }
+ }
+#endif
+ ep->e_flags &= ~NEW;
+ }
+ }
+ if (ferror(mf))
+ panic("error setting directory modes\n");
+ (void) fclose(mf);
+}
+
/*
* Generate a literal copy of a directory.
*/
int
-genliteraldir(name, ino)
- char *name;
- ino_t ino;
+genliteraldir(char *name, dump_ino_t ino)
{
- register struct inotab *itp;
+ struct inotab *itp;
int ofile, dp, i, size;
char buf[BUFSIZ];
if (itp == NULL)
panic("Cannot find directory inode %d named %s\n", ino, name);
if ((ofile = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
- fprintf(stderr, "%s: ", name);
- (void) fflush(stderr);
- fprintf(stderr, "cannot create file: %s\n", strerror(errno));
+ warn("%s: cannot create file\n", name);
return (FAIL);
}
rst_seekdir(dirp, itp->t_seekpt, itp->t_seekpt);
for (i = itp->t_size; i > 0; i -= BUFSIZ) {
size = i < BUFSIZ ? i : BUFSIZ;
if (read(dp, buf, (int) size) == -1) {
- fprintf(stderr,
- "write error extracting inode %ld, name %s\n",
- curfile.ino, curfile.name);
- fprintf(stderr, "read: %s\n", strerror(errno));
- done(1);
+ warnx("write error extracting inode %lu, name %s\n",
+ (unsigned long)curfile.ino, curfile.name);
+ err(1, "read");
}
if (!Nflag && write(ofile, buf, (int) size) == -1) {
- fprintf(stderr,
- "write error extracting inode %ld, name %s\n",
- curfile.ino, curfile.name);
- fprintf(stderr, "write: %s\n", strerror(errno));
- done(1);
+ warnx("write error extracting inode %lu, name %s\n",
+ (unsigned long)curfile.ino, curfile.name);
+ err(1, "write");
}
}
(void) close(dp);
* Determine the type of an inode
*/
int
-inodetype(ino)
- ino_t ino;
+inodetype(dump_ino_t ino)
{
struct inotab *itp;
* If requested, save its pertinent mode, owner, and time info.
*/
static struct inotab *
-allocinotab(ino, dip, seekpt)
- ino_t ino;
-#ifdef __linux__
- struct new_bsd_inode *dip;
+#if defined(__linux__) || defined(sunos)
+allocinotab(dump_ino_t ino, OFF_T seekpt)
#else
- struct dinode *dip;
+allocinotab(dump_ino_t ino, OFF_T seekpt)
#endif
- long seekpt;
{
- register struct inotab *itp;
- struct modeinfo node;
+ struct inotab *itp;
itp = calloc(1, sizeof(struct inotab));
if (itp == NULL)
inotab[INOHASH(ino)] = itp;
itp->t_ino = ino;
itp->t_seekpt = seekpt;
+ return itp;
+}
+
+static void
+#if defined(__linux__) || defined(sunos)
+savemodeinfo(dump_ino_t ino, struct new_bsd_inode *dip) {
+#else
+savemodeinfo(dump_ino_t ino, struct dinode *dip) {
+#endif
+ struct modeinfo node;
+
if (mf == NULL)
- return (itp);
+ return;
node.ino = ino;
-#ifdef __linux__
+#if defined(__linux__) || defined(sunos)
node.timep[0].tv_sec = dip->di_atime.tv_sec;
node.timep[0].tv_usec = dip->di_atime.tv_usec;
node.timep[1].tv_sec = dip->di_mtime.tv_sec;
node.timep[1].tv_usec = dip->di_mtime.tv_usec;
-#else /* __linux__ */
+#else /* __linux__ || sunos */
node.timep[0].tv_sec = dip->di_atime;
node.timep[0].tv_usec = dip->di_atimensec / 1000;
node.timep[1].tv_sec = dip->di_mtime;
node.timep[1].tv_usec = dip->di_mtimensec / 1000;
-#endif /* __linux__ */
+#endif /* __linux__ || sunos */
node.mode = dip->di_mode;
node.flags = dip->di_flags;
node.uid = dip->di_uid;
node.gid = dip->di_gid;
- (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf);
- return (itp);
+ if ( fwrite((char *)&node, 1, sizeof(struct modeinfo), mf) != sizeof(struct modeinfo) )
+ err(1,"cannot write to file %s", modefile);
}
/*
* Look up an inode in the table of directories
*/
static struct inotab *
-inotablookup(ino)
- ino_t ino;
+inotablookup(dump_ino_t ino)
{
- register struct inotab *itp;
+ struct inotab *itp;
for (itp = inotab[INOHASH(ino)]; itp != NULL; itp = itp->t_next)
if (itp->t_ino == ino)
* Clean up and exit
*/
void
-done(exitcode)
- int exitcode;
+cleanup(void)
{
-
closemt();
if (modefile[0] != '#')
(void) unlink(modefile);
if (dirfile[0] != '#')
(void) unlink(dirfile);
- exit(exitcode);
}
git.wh0rd.org / dump.git / blobdiff