Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-4]: src/usr.sbin/pkg_install/admin Pull up revision 1.8:



details:   https://anonhg.NetBSD.org/src/rev/7607bf52df14
branches:  netbsd-1-4
changeset: 469398:7607bf52df14
user:      he <he%NetBSD.org@localhost>
date:      Mon Sep 13 22:47:00 1999 +0000

description:
Pull up revision 1.8:
  Handle symlinks to directories correctly in "check" and "rebuild"
  targets.  (hubertf)

diffstat:

 usr.sbin/pkg_install/admin/main.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r aee7af7643a1 -r 7607bf52df14 usr.sbin/pkg_install/admin/main.c
--- a/usr.sbin/pkg_install/admin/main.c Mon Sep 13 22:41:07 1999 +0000
+++ b/usr.sbin/pkg_install/admin/main.c Mon Sep 13 22:47:00 1999 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: main.c,v 1.3.2.2 1999/09/13 21:59:05 he Exp $  */
+/*     $NetBSD: main.c,v 1.3.2.3 1999/09/13 22:47:00 he Exp $  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.3.2.2 1999/09/13 21:59:05 he Exp $");
+__RCSID("$NetBSD: main.c,v 1.3.2.3 1999/09/13 22:47:00 he Exp $");
 #endif
 
 /*
@@ -87,7 +87,7 @@
                        
                        (void) snprintf(file, sizeof(file), "%s/%s", dirp, p->name);
 
-                       if (!isfile(file))
+                       if (!(isfile(file) || islinktodir(file)))
                                warnx("%s: File %s is in %s but not on filesystem!", PkgName, file, CONTENTS_FNAME);
                        else {
                                if (p->next &&
@@ -212,7 +212,7 @@
 
                                (void) snprintf(file, sizeof(file), "%s/%s", dirp, p->name);
 
-                               if (!isfile(file))
+                               if (!(isfile(file) || islinktodir(file)))
                                        warnx("%s: File %s is in %s but not on filesystem!",
                                            PkgName, file, CONTENTS_FNAME);
                                else {



Home | Main Index | Thread Index | Old Index