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

- apply_specdir(): when adding a new symlink from the specfile, do the assert

Browse Source 
check on the correct node
- apply_specentry(): if this node is a duplicate of another, apply the
  changes to the `master' entry instead of this one.
- fix inotype() to DTRT
- comment out some debugging info that is too verbose
This commit is contained in:
lukem 2001-10-29 05:38:09 +00:00
parent 7b1918bdc8
commit d1270f6de8
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/makefs/walk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: walk.c,v 1.2 2001/10/28 13:14:05 lukem Exp $ */ /* $NetBSD: walk.c,v 1.3 2001/10/29 05:38:09 lukem Exp $ */
/* /*
* Copyright 2001 Wasabi Systems, Inc. * Copyright 2001 Wasabi Systems, Inc.
@ -77,7 +77,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef __lint #ifndef __lint
__RCSID("$NetBSD: walk.c,v 1.2 2001/10/28 13:14:05 lukem Exp $"); __RCSID("$NetBSD: walk.c,v 1.3 2001/10/29 05:38:09 lukem Exp $");
#endif /* !__lint */ #endif /* !__lint */
#include <sys/param.h> #include <sys/param.h>
@ -267,9 +267,11 @@ apply_specdir(const char *dir, NODE *specnode, fsnode *dirnode)
curnode->name); curnode->name);
for (curfsnode = dirnode->next; curfsnode != NULL; for (curfsnode = dirnode->next; curfsnode != NULL;
curfsnode = curfsnode->next) { curfsnode = curfsnode->next) {
#if 0 /* too verbose for now */
if (debug & DEBUG_APPLY_SPECENTRY) if (debug & DEBUG_APPLY_SPECENTRY)
printf("apply_specdir: dirent %s\n", printf("apply_specdir: dirent %s\n",
curfsnode->name); curfsnode->name);
#endif
if (strcmp(curnode->name, curfsnode->name) == 0) if (strcmp(curnode->name, curfsnode->name) == 0)
break; break;
} }
@ -315,7 +317,7 @@ apply_specdir(const char *dir, NODE *specnode, fsnode *dirnode)
curfsnode->child->first = curfsnode->child; curfsnode->child->first = curfsnode->child;
} }
if (curfsnode->type == S_IFLNK) { if (curfsnode->type == S_IFLNK) {
assert(specnode->slink != NULL); assert(curnode->slink != NULL);
/* for symlinks, copy the target */ /* for symlinks, copy the target */
if ((curfsnode->symlink = if ((curfsnode->symlink =
strdup(curnode->slink)) == NULL) strdup(curnode->slink)) == NULL)
@ -351,6 +353,16 @@ apply_specentry(const char *dir, NODE *specnode, fsnode *dirnode)
if (debug & DEBUG_APPLY_SPECENTRY) if (debug & DEBUG_APPLY_SPECENTRY)
printf("apply_specentry: %s/%s\n", dir, dirnode->name); printf("apply_specentry: %s/%s\n", dir, dirnode->name);
/*
* if this is a duplicate (i.e, an existing hardlink),
* change the actual settings.
*/
if (dirnode->dup != NULL) {
if (debug & DEBUG_APPLY_SPECENTRY)
printf("\t\t\thard-linked to %s\n", dirnode->dup->name);
dirnode = dirnode->dup;
}
#define ASEPRINT(t, b, o, n) \ #define ASEPRINT(t, b, o, n) \
if (debug & DEBUG_APPLY_SPECENTRY) \ if (debug & DEBUG_APPLY_SPECENTRY) \
printf("\t\t\tchanging %s from " b " to " b "\n", \ printf("\t\t\tchanging %s from " b " to " b "\n", \
@ -464,7 +476,7 @@ const char *
inode_type(mode_t mode) inode_type(mode_t mode)
{ {
if (mode & S_IFLNK) if (S_ISLNK(mode))
return ("symlink"); /* inotype() returns "link"... */ return ("symlink"); /* inotype() returns "link"... */
return (inotype(mode)); return (inotype(mode));
} }