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.7:
details: https://anonhg.NetBSD.org/src/rev/6b049f77b6de
branches: netbsd-1-4
changeset: 469376:6b049f77b6de
user: he <he%NetBSD.org@localhost>
date: Mon Sep 13 21:59:05 1999 +0000
description:
Pull up revision 1.7:
Bring closer to /usr/share/misc/style with the aid of indent(1). (hubertf)
diffstat:
usr.sbin/pkg_install/admin/main.c | 754 +++++++++++++++++++------------------
1 files changed, 379 insertions(+), 375 deletions(-)
diffs (truncated from 819 to 300 lines):
diff -r 5acc0d9404c2 -r 6b049f77b6de usr.sbin/pkg_install/admin/main.c
--- a/usr.sbin/pkg_install/admin/main.c Mon Sep 13 21:57:36 1999 +0000
+++ b/usr.sbin/pkg_install/admin/main.c Mon Sep 13 21:59:05 1999 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: main.c,v 1.3.2.1 1999/08/22 17:40:14 he Exp $ */
+/* $NetBSD: main.c,v 1.3.2.2 1999/09/13 21:59:05 he Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.3.2.1 1999/08/22 17:40:14 he Exp $");
+__RCSID("$NetBSD: main.c,v 1.3.2.2 1999/09/13 21:59:05 he Exp $");
#endif
/*
@@ -47,427 +47,431 @@
#include "lib.h"
-void usage(void);
+void usage(void);
-extern const char *__progname; /* from crt0.o */
+extern const char *__progname; /* from crt0.o */
-int filecnt;
+int filecnt;
/*
- * assumes CWD is in /var/db/pkg/<pkg>!
+ * Assumes CWD is in /var/db/pkg/<pkg>!
*/
-static void check1pkg(const char *pkgdir)
+static void
+check1pkg(const char *pkgdir)
{
- FILE *f;
- plist_t *p;
- package_t Plist;
- char *PkgName, *dirp=NULL, *md5file;
- char file[FILENAME_MAX];
- char dir[FILENAME_MAX];
-
- f=fopen(CONTENTS_FNAME, "r");
- if (f == NULL)
- err(1, "can't open %s/%s/%s", _pkgdb_getPKGDB_DIR(), pkgdir, CONTENTS_FNAME);
-
- Plist.head=Plist.tail=NULL;
- read_plist(&Plist, f);
- p = find_plist(&Plist, PLIST_NAME);
- if (p == NULL)
- errx(1, "Package %s has no @name, aborting.\n",
- pkgdir);
- PkgName=p->name;
- for (p = Plist.head; p ; p = p->next) {
- switch(p->type) {
- case PLIST_FILE:
- if (dirp == NULL) {
- warnx("dirp not initialized, please send-pr!");
- abort();
- }
-
- (void) snprintf(file, sizeof(file), "%s/%s", dirp, p->name);
-
- if (!isfile(file))
- warnx("%s: File %s is in %s but not on filesystem!", PkgName, file, CONTENTS_FNAME);
- else {
- if (p->next &&
- p->next->type == PLIST_COMMENT &&
- strncmp(p->next->name, CHECKSUM_HEADER, ChecksumHeaderLen) == 0) { /* || PLIST_MD5 - HF */
- if ((md5file = MD5File(file, NULL)) != NULL) {
- /* Mismatch? */
-#ifdef PKGDB_DEBUG
- printf("%s: md5 should=<%s>, is=<%s>\n",
- file, p->next->name + ChecksumHeaderLen, md5file);
-#endif
- if (strcmp(md5file, p->next->name + ChecksumHeaderLen) != 0)
- printf("%s fails MD5 checksum\n", file);
+ FILE *f;
+ plist_t *p;
+ package_t Plist;
+ char *PkgName, *dirp = NULL, *md5file;
+ char file[FILENAME_MAX];
+ char dir[FILENAME_MAX];
- free(md5file);
- }
- }
-
- filecnt++;
- }
- break;
- case PLIST_CWD:
- if (strcmp(p->name, ".") != 0)
- dirp = p->name;
- else {
- (void) snprintf(dir, sizeof(dir), "%s/%s", _pkgdb_getPKGDB_DIR(), pkgdir);
- dirp = dir;
- }
- break;
- case PLIST_SRC:
- warnx("@src is deprecated - please send-pr for %s!\n", PkgName);
- break;
- case PLIST_IGNORE:
- p = p->next;
- break;
- case PLIST_SHOW_ALL:
- case PLIST_CMD:
- case PLIST_CHMOD:
- case PLIST_CHOWN:
- case PLIST_CHGRP:
- case PLIST_COMMENT:
- case PLIST_NAME:
- case PLIST_UNEXEC:
- case PLIST_DISPLAY:
- case PLIST_PKGDEP:
- case PLIST_MTREE:
- case PLIST_DIR_RM:
- case PLIST_IGNORE_INST:
- case PLIST_OPTION:
- case PLIST_PKGCFL:
- break;
- }
- }
- free_plist(&Plist);
- fclose(f);
-}
+ f = fopen(CONTENTS_FNAME, "r");
+ if (f == NULL)
+ err(1, "can't open %s/%s/%s", _pkgdb_getPKGDB_DIR(), pkgdir, CONTENTS_FNAME);
-static void rebuild(void)
-{
- DIR *dp;
- struct dirent *de;
- FILE *f;
- plist_t *p;
- char *PkgName, dir[FILENAME_MAX], *dirp=NULL;
- char *PkgDBDir=NULL, file[FILENAME_MAX];
- int pkgcnt=0;
-
- filecnt=0;
-
- if (unlink(_pkgdb_getPKGDB_FILE()) != 0 && errno!=ENOENT)
- err(1, "unlink %s", _pkgdb_getPKGDB_FILE());
-
- if (pkgdb_open(0)==-1)
- err(1, "cannot open pkgdb");
-
- setbuf(stdout, NULL);
- PkgDBDir=_pkgdb_getPKGDB_DIR();
- chdir(PkgDBDir);
-#ifdef PKGDB_DEBUG
- printf("PkgDBDir='%s'\n", PkgDBDir);
-#endif
- dp=opendir(".");
- if (dp == NULL)
- err(1,"opendir failed");
- while ((de = readdir(dp))) {
- package_t Plist;
-
- if (!isdir(de->d_name))
- continue;
-
- if (strcmp(de->d_name, ".")==0 ||
- strcmp(de->d_name, "..")==0)
- continue;
-
-#ifdef PKGDB_DEBUG
- printf("%s\n", de->d_name);
-#else
- printf(".");
-#endif
-
- chdir(de->d_name);
-
- f=fopen(CONTENTS_FNAME, "r");
- if (f == NULL)
- err(1, "can't open %s/%s", de->d_name, CONTENTS_FNAME);
-
- Plist.head=Plist.tail=NULL;
+ Plist.head = Plist.tail = NULL;
read_plist(&Plist, f);
p = find_plist(&Plist, PLIST_NAME);
if (p == NULL)
- errx(1, "Package %s has no @name, aborting.\n",
- de->d_name);
- PkgName=p->name;
- for (p = Plist.head; p ; p = p->next) {
- switch(p->type) {
- case PLIST_FILE:
- if (dirp == NULL) {
- warnx("dirp not initialized, please send-pr!");
- abort();
- }
-
- (void) snprintf(file, sizeof(file), "%s/%s", dirp, p->name);
+ errx(1, "Package %s has no @name, aborting.\n",
+ pkgdir);
+ PkgName = p->name;
+ for (p = Plist.head; p; p = p->next) {
+ switch (p->type) {
+ case PLIST_FILE:
+ if (dirp == NULL) {
+ warnx("dirp not initialized, please send-pr!");
+ abort();
+ }
+
+ (void) snprintf(file, sizeof(file), "%s/%s", dirp, p->name);
+
+ if (!isfile(file))
+ warnx("%s: File %s is in %s but not on filesystem!", PkgName, file, CONTENTS_FNAME);
+ else {
+ if (p->next &&
+ p->next->type == PLIST_COMMENT &&
+ strncmp(p->next->name, CHECKSUM_HEADER, ChecksumHeaderLen) == 0) { /* || PLIST_MD5 - HF */
+ if ((md5file = MD5File(file, NULL)) != NULL) {
+ /* Mismatch? */
+#ifdef PKGDB_DEBUG
+ printf("%s: md5 should=<%s>, is=<%s>\n",
+ file, p->next->name + ChecksumHeaderLen, md5file);
+#endif
+ if (strcmp(md5file, p->next->name + ChecksumHeaderLen) != 0)
+ printf("%s fails MD5 checksum\n", file);
- if (!isfile(file))
- warnx("%s: File %s is in %s but not on filesystem!",
- PkgName, file, CONTENTS_FNAME);
- else {
- pkgdb_store(file, PkgName);
- filecnt++;
+ free(md5file);
+ }
+ }
+
+ filecnt++;
+ }
+ break;
+ case PLIST_CWD:
+ if (strcmp(p->name, ".") != 0)
+ dirp = p->name;
+ else {
+ (void) snprintf(dir, sizeof(dir), "%s/%s", _pkgdb_getPKGDB_DIR(), pkgdir);
+ dirp = dir;
+ }
+ break;
+ case PLIST_SRC:
+ warnx("@src is deprecated - please send-pr for %s!\n", PkgName);
+ break;
+ case PLIST_IGNORE:
+ p = p->next;
+ break;
+ case PLIST_SHOW_ALL:
+ case PLIST_CMD:
+ case PLIST_CHMOD:
+ case PLIST_CHOWN:
+ case PLIST_CHGRP:
+ case PLIST_COMMENT:
+ case PLIST_NAME:
+ case PLIST_UNEXEC:
+ case PLIST_DISPLAY:
+ case PLIST_PKGDEP:
+ case PLIST_MTREE:
+ case PLIST_DIR_RM:
+ case PLIST_IGNORE_INST:
+ case PLIST_OPTION:
+ case PLIST_PKGCFL:
+ break;
}
- break;
- case PLIST_CWD:
- if (strcmp(p->name, ".") != 0)
- dirp = p->name;
- else {
- (void) snprintf(dir, sizeof(dir), "%s/%s", PkgDBDir, de->d_name);
- dirp = dir;
- }
- break;
- case PLIST_SRC:
- warnx("@src is deprecated - please send-pr for %s!\n", PkgName);
- break;
- case PLIST_IGNORE:
- p = p->next;
- break;
- case PLIST_SHOW_ALL:
- case PLIST_CMD:
- case PLIST_CHMOD:
- case PLIST_CHOWN:
- case PLIST_CHGRP:
- case PLIST_COMMENT:
- case PLIST_NAME:
- case PLIST_UNEXEC:
- case PLIST_DISPLAY:
- case PLIST_PKGDEP:
- case PLIST_MTREE:
- case PLIST_DIR_RM:
- case PLIST_IGNORE_INST:
- case PLIST_OPTION:
- case PLIST_PKGCFL:
- break;
- }
Home |
Main Index |
Thread Index |
Old Index