* 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@noos.fr>, 1999-2000
- * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ * 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
static const char rcsid[] =
- "$Id: dirs.c,v 1.13 2000/12/21 11:14:54 stelian Exp $";
+ "$Id: dirs.c,v 1.28 2004/05/25 10:39:30 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>
#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;
/*
* 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, struct new_bsd_inode *, OFF_T));
#else
-static struct inotab *allocinotab __P((ino_t, struct dinode *, long));
+static struct inotab *allocinotab __P((dump_ino_t, struct dinode *, OFF_T));
#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 *, 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
void
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;
if (command != 'r' && command != 'R') {
(void) strncat(dirfile, "-XXXXXX",
sizeof(dirfile) - strlen(dirfile));
- fd = mkstemp(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);
if (command != 'r' && command != 'R') {
(void) strncat(modefile, "-XXXXXX",
sizeof(modefile) - strlen(modefile));
- fd = mkstemp(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);
* pname and pass them off to be processed.
*/
void
-treescan(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);
* skipping over "." and ".."
*/
namelen = snprintf(locname, sizeof(locname), "%s/", pname);
- if (namelen >= sizeof(locname))
+ if (namelen >= (int)sizeof(locname))
namelen = sizeof(locname) - 1;
rst_seekdir(dirp, itp->t_seekpt, itp->t_seekpt);
dp = rst_readdir(dirp); /* "." */
*/
while (dp != NULL) {
locname[namelen] = '\0';
- if (namelen + dp->d_namlen >= sizeof(locname)) {
+ 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 {
struct direct *
pathsearch(const char *pathname)
{
- ino_t ino;
+ dump_ino_t ino;
struct direct *dp;
char *path, *name, buffer[MAXPATHLEN];
while (*path == '/')
path++;
dp = NULL;
+#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(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);
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",
if (!Bcvt)
dp->d_namlen = dp->d_type;
# endif
+ if (dp->d_namlen == 0 && dp->d_type != 0)
+ dp->d_namlen = dp->d_type;
dp->d_type = DT_UNKNOWN;
}
#ifdef DIRDEBUG
i = DIRBLKSIZ - (loc & (DIRBLKSIZ - 1));
if ((dp->d_reclen & 0x3) != 0 ||
dp->d_reclen > i ||
- dp->d_reclen < DIRSIZ(0, dp) ||
- dp->d_namlen > MAXNAMLEN) {
+ 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 less than DIRSIZ (%d < %d) ",
dp->d_reclen, DIRSIZ(0, dp));
+#if MAXNAMLEN < 255
if (dp->d_namlen > MAXNAMLEN)
Vprintf(stdout,
"reclen name too big (%d > %d) ",
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.
((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev;
if ( fwrite(dirbuf, (int)dirloc, 1, df) != 1 )
err(1, "cannot write to file %s", dirfile);
- seekpt = ftell(df);
+ seekpt = FTELL(df);
if (seekpt == -1)
err(1, "cannot write to file %s", dirfile);
dirloc = 0;
* the desired seek offset into it.
*/
static void
-rst_seekdir(RST_DIR *dirp, long loc, long 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);
struct direct *
rst_readdir(RST_DIR *dirp)
{
- register struct direct *dp;
+ struct direct *dp;
for (;;) {
if (dirp->dd_loc == 0) {
{
struct inotab *itp;
RST_DIR *dirp;
- ino_t ino;
+ dump_ino_t ino;
if ((ino = dirlookup(name)) > 0 &&
(itp = inotablookup(ino)) != NULL) {
/*
* Simulate finding the current offset in the directory.
*/
-static long
+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);
}
/*
static RST_DIR *
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);
ep->e_flags &= ~NEW;
continue;
}
- if (node.ino == ROOTINO &&
+ if ((flags & FORCE) == 0 &&
+ node.ino == ROOTINO &&
reply("set owner/mode for '.'") == FAIL)
continue;
}
if (node.flags)
#ifdef __linux__
(void) fsetflags(cp, node.flags);
+#else
+#ifdef sunos
#else
(void) chflags(cp, node.flags);
+#endif
#endif
utimes(cp, node.timep);
ep->e_flags &= ~NEW;
* Generate a literal copy of a directory.
*/
int
-genliteraldir(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];
* Determine the type of an inode
*/
int
-inodetype(ino_t ino)
+inodetype(dump_ino_t ino)
{
struct inotab *itp;
* If requested, save its pertinent mode, owner, and time info.
*/
static struct inotab *
-#ifdef __linux__
-allocinotab(ino_t ino, struct new_bsd_inode *dip, long seekpt)
+#if defined(__linux__) || defined(sunos)
+allocinotab(dump_ino_t ino, struct new_bsd_inode *dip, OFF_T seekpt)
#else
-allocinotab(ino_t ino, struct dinode *dip, long seekpt)
+allocinotab(dump_ino_t ino, struct dinode *dip, OFF_T seekpt)
#endif
{
- register struct inotab *itp;
+ struct inotab *itp;
struct modeinfo node;
itp = calloc(1, sizeof(struct inotab));
if (mf == NULL)
return (itp);
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;
* Look up an inode in the table of directories
*/
static struct inotab *
-inotablookup(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)
git.wh0rd.org / dump.git / blobdiff