Source-Changes-HG archive

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

[src/netbsd-1-5]: src/usr.sbin/pkg_install/create Pull up rev. 1.19, approved...



details:   https://anonhg.NetBSD.org/src/rev/aa80a95d34a6
branches:  netbsd-1-5
changeset: 488437:aa80a95d34a6
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Wed Jul 05 20:39:33 2000 +0000

description:
Pull up rev. 1.19, approved by thorpej.

Only calculate MD5 checksum for plain files.
As a side effect, fixes handlink of links to dirs.

diffstat:

 usr.sbin/pkg_install/create/pl.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (46 lines):

diff -r 405cece203be -r aa80a95d34a6 usr.sbin/pkg_install/create/pl.c
--- a/usr.sbin/pkg_install/create/pl.c  Wed Jul 05 20:38:52 2000 +0000
+++ b/usr.sbin/pkg_install/create/pl.c  Wed Jul 05 20:39:33 2000 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: pl.c,v 1.18 1999/11/29 20:09:55 hubertf Exp $  */
+/*     $NetBSD: pl.c,v 1.18.4.1 2000/07/05 20:39:33 hubertf Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: pl.c,v 1.11 1997/10/08 07:46:35 charnier Exp";
 #else
-__RCSID("$NetBSD: pl.c,v 1.18 1999/11/29 20:09:55 hubertf Exp $");
+__RCSID("$NetBSD: pl.c,v 1.18.4.1 2000/07/05 20:39:33 hubertf Exp $");
 #endif
 #endif
 
@@ -188,18 +188,18 @@
                                warnx("Warning - block special device `%s' in PLIST", name);
                                break;
                        default:
+                               (void) strcpy(buf, CHECKSUM_HEADER);
+                               if (MD5File(name, &buf[ChecksumHeaderLen]) != (char *) NULL) {
+                                       tmp = new_plist_entry();
+                                       tmp->name = strdup(buf);
+                                       tmp->type = PLIST_COMMENT;      /* PLIST_MD5 - HF */
+                                       tmp->next = p->next;
+                                       tmp->prev = p;
+                                       p->next = tmp;
+                                       p = tmp;
+                               }
                                break;
                        }
-                       (void) strcpy(buf, CHECKSUM_HEADER);
-                       if (MD5File(name, &buf[ChecksumHeaderLen]) != (char *) NULL) {
-                               tmp = new_plist_entry();
-                               tmp->name = strdup(buf);
-                               tmp->type = PLIST_COMMENT;      /* PLIST_MD5 - HF */
-                               tmp->next = p->next;
-                               tmp->prev = p;
-                               p->next = tmp;
-                               p = tmp;
-                       }
                        break;
                default:
                        break;



Home | Main Index | Thread Index | Old Index