* 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.15 2001/06/18 10:58:28 stelian Exp $";
+ "$Id: dirs.c,v 1.23 2003/03/30 15:40:38 stelian Exp $";
#endif /* not lint */
#include <config.h>
char d_name[ODIRSIZ];
};
-#ifdef __linux__
+#if defined(__linux__) || defined(sunos)
static struct inotab *allocinotab __P((dump_ino_t, struct new_bsd_inode *, long));
#else
static struct inotab *allocinotab __P((dump_ino_t, struct dinode *, long));
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;
void
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;
char locname[MAXPATHLEN + 1];
* 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 {
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;
static struct direct *
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) {
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
/*
* 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 *
rst_readdir(RST_DIR *dirp)
{
- register struct direct *dp;
+ struct direct *dp;
for (;;) {
if (dirp->dd_loc == 0) {
rst_telldir(RST_DIR *dirp)
{
return ((long)lseek(dirp->dd_fd,
- (off_t)0, SEEK_CUR) - dirp->dd_size + dirp->dd_loc);
+ (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)
return (NULL);
ep->e_flags &= ~NEW;
continue;
}
- if (node.ino == ROOTINO &&
+ if ((flags & FORCE) == 0 &&
+ node.ino == ROOTINO &&
reply("set owner/mode for '.'") == FAIL)
continue;
}
int
genliteraldir(char *name, dump_ino_t ino)
{
- register struct inotab *itp;
+ struct inotab *itp;
int ofile, dp, i, size;
char buf[BUFSIZ];
allocinotab(dump_ino_t ino, struct dinode *dip, long seekpt)
#endif
{
- register struct inotab *itp;
+ struct inotab *itp;
struct modeinfo node;
itp = calloc(1, sizeof(struct inotab));
static struct inotab *
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)