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/create Pull up revision 1.14:
details: https://anonhg.NetBSD.org/src/rev/4a8b2b2e5d19
branches: netbsd-1-4
changeset: 469378:4a8b2b2e5d19
user: he <he%NetBSD.org@localhost>
date: Mon Sep 13 22:02:00 1999 +0000
description:
Pull up revision 1.14:
Bring closer to /usr/share/misc/style with the aid of indent(1). (hubertf)
diffstat:
usr.sbin/pkg_install/create/main.c | 261 ++++++++++++++++++------------------
1 files changed, 130 insertions(+), 131 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r 2d4aedd92609 -r 4a8b2b2e5d19 usr.sbin/pkg_install/create/main.c
--- a/usr.sbin/pkg_install/create/main.c Mon Sep 13 22:00:44 1999 +0000
+++ b/usr.sbin/pkg_install/create/main.c Mon Sep 13 22:02:00 1999 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: main.c,v 1.13 1999/03/22 05:02:40 hubertf Exp $ */
+/* $NetBSD: main.c,v 1.13.2.1 1999/09/13 22:02:00 he Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: main.c,v 1.17 1997/10/08 07:46:23 charnier Exp";
#else
-__RCSID("$NetBSD: main.c,v 1.13 1999/03/22 05:02:40 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.13.2.1 1999/09/13 22:02:00 he Exp $");
#endif
#endif
@@ -26,166 +26,165 @@
static char Options[] = "ORhlvFf:p:P:C:c:d:i:k:r:t:X:D:m:s:b:B:";
-char *Prefix = NULL;
-char *Comment = NULL;
-char *Desc = NULL;
-char *SrcDir = NULL;
-char *Display = NULL;
-char *Install = NULL;
-char *DeInstall = NULL;
-char *Contents = NULL;
-char *Require = NULL;
-char *ExcludeFrom = NULL;
-char *Mtree = NULL;
-char *Pkgdeps = NULL;
-char *Pkgcfl = NULL;
-char *BuildVersion = NULL;
-char *BuildInfo = NULL;
-char PlayPen[FILENAME_MAX];
-size_t PlayPenSize = sizeof(PlayPen);
-int Dereference = 0;
-int PlistOnly = 0;
-int RelativeLinks = 0;
-int ReorderDirs = 0;
-Boolean File2Pkg = FALSE;
+char *Prefix = NULL;
+char *Comment = NULL;
+char *Desc = NULL;
+char *SrcDir = NULL;
+char *Display = NULL;
+char *Install = NULL;
+char *DeInstall = NULL;
+char *Contents = NULL;
+char *Require = NULL;
+char *ExcludeFrom = NULL;
+char *Mtree = NULL;
+char *Pkgdeps = NULL;
+char *Pkgcfl = NULL;
+char *BuildVersion = NULL;
+char *BuildInfo = NULL;
+char PlayPen[FILENAME_MAX];
+size_t PlayPenSize = sizeof(PlayPen);
+int Dereference = 0;
+int PlistOnly = 0;
+int RelativeLinks = 0;
+int ReorderDirs = 0;
+Boolean File2Pkg = FALSE;
static void
usage(void)
{
- fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n",
-"usage: pkg_create [-ORhlv] [-P dpkgs] [-C cpkgs] [-p prefix] [-f contents]",
-" [-i iscript] [-k dscript] [-r rscript] [-t template]",
-" [-X excludefile] [-D displayfile] [-m mtreefile]",
-" [-b build-version-file] [-B build-info-file]",
-" -c comment -d description -f packlist pkg-name");
- exit(1);
+ fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n",
+ "usage: pkg_create [-ORhlv] [-P dpkgs] [-C cpkgs] [-p prefix] [-f contents]",
+ " [-i iscript] [-k dscript] [-r rscript] [-t template]",
+ " [-X excludefile] [-D displayfile] [-m mtreefile]",
+ " [-b build-version-file] [-B build-info-file]",
+ " -c comment -d description -f packlist pkg-name");
+ exit(1);
}
int
main(int argc, char **argv)
{
- int ch;
- lpkg_head_t pkgs;
- lpkg_t *lpp;
+ int ch;
+ lpkg_head_t pkgs;
+ lpkg_t *lpp;
- while ((ch = getopt(argc, argv, Options)) != -1)
- switch(ch) {
- case 'v':
- Verbose = TRUE;
- break;
+ while ((ch = getopt(argc, argv, Options)) != -1)
+ switch (ch) {
+ case 'v':
+ Verbose = TRUE;
+ break;
- case 'O':
- PlistOnly = 1;
- break;
+ case 'O':
+ PlistOnly = 1;
+ break;
- case 'R':
- ReorderDirs = 1;
- break;
+ case 'R':
+ ReorderDirs = 1;
+ break;
- case 'p':
- Prefix = optarg;
- break;
+ case 'p':
+ Prefix = optarg;
+ break;
- case 's':
- SrcDir = optarg;
- break;
+ case 's':
+ SrcDir = optarg;
+ break;
- case 'f':
- Contents = optarg;
- break;
+ case 'f':
+ Contents = optarg;
+ break;
- case 'c':
- Comment = optarg;
- break;
+ case 'c':
+ Comment = optarg;
+ break;
- case 'd':
- Desc = optarg;
- break;
+ case 'd':
+ Desc = optarg;
+ break;
+
+ case 'i':
+ Install = optarg;
+ break;
- case 'i':
- Install = optarg;
- break;
+ case 'k':
+ DeInstall = optarg;
+ break;
- case 'k':
- DeInstall = optarg;
- break;
+ case 'l':
+ RelativeLinks = 1;
+ break;
- case 'l':
- RelativeLinks = 1;
- break;
+ case 'r':
+ Require = optarg;
+ break;
- case 'r':
- Require = optarg;
- break;
+ case 't':
+ strcpy(PlayPen, optarg);
+ break;
- case 't':
- strcpy(PlayPen, optarg);
- break;
+ case 'X':
+ ExcludeFrom = optarg;
+ break;
- case 'X':
- ExcludeFrom = optarg;
- break;
+ case 'h':
+ Dereference = 1;
+ break;
+
+ case 'D':
+ Display = optarg;
+ break;
- case 'h':
- Dereference = 1;
- break;
+ case 'm':
+ Mtree = optarg;
+ break;
- case 'D':
- Display = optarg;
- break;
+ case 'P':
+ Pkgdeps = optarg;
+ break;
- case 'm':
- Mtree = optarg;
- break;
+ case 'C':
+ Pkgcfl = optarg;
+ break;
- case 'P':
- Pkgdeps = optarg;
- break;
+ case 'b':
+ BuildVersion = optarg;
+ break;
- case 'C':
- Pkgcfl = optarg;
- break;
+ case 'B':
+ BuildInfo = optarg;
+ break;
- case 'b':
- BuildVersion = optarg;
- break;
+ case '?':
+ default:
+ usage();
+ break;
+ }
- case 'B':
- BuildInfo = optarg;
- break;
+ argc -= optind;
+ argv += optind;
+
+ TAILQ_INIT(&pkgs);
- case '?':
- default:
- usage();
- break;
+ /* Get all the remaining package names, if any */
+ while (*argv) {
+ lpp = alloc_lpkg(*argv);
+ TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
+ argv++;
}
- argc -= optind;
- argv += optind;
-
- TAILQ_INIT(&pkgs);
-
- /* Get all the remaining package names, if any */
- while (*argv) {
- lpp = alloc_lpkg(*argv);
- TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
- argv++;
- }
-
- /* If no packages, yelp */
- lpp = TAILQ_FIRST(&pkgs);
- if (lpp == NULL)
- warnx("missing package name"), usage();
- lpp = TAILQ_NEXT(lpp, lp_link);
- if (lpp != NULL)
- warnx("only one package name allowed ('%s' extraneous)",
- lpp->lp_name),
- usage();
- if (!pkg_perform(&pkgs)) {
- if (Verbose)
- warnx("package creation failed");
- return 1;
- }
- else
- return 0;
+ /* If no packages, yelp */
+ lpp = TAILQ_FIRST(&pkgs);
+ if (lpp == NULL)
+ warnx("missing package name"), usage();
Home |
Main Index |
Thread Index |
Old Index