work around the missing (gtar) -T (--files-from) option of our paxtar

in pkg_create so that it should work now with paxtar (the -X option is
still missing due to missing -X - in the gtar meaning --exclude-from-file
option)

i did it by changing the FreeBSD way of doing it (open a pipe to tar with
-T - (read filenames from stdin) and give all the filenames to the pipe)
to constructing a big :-) argumentlist for tar and executing it without
the pipe (not the best solution but it works :-)

diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index d8cc661..5d318d0 100644 (file)
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,7 +1,7 @@
-/*     $OpenBSD: main.c,v 1.2 1996/06/04 08:43:35 niklas Exp $ */
+/*     $OpenBSD: main.c,v 1.3 1996/12/29 12:18:27 graichen Exp $       */
 
 #ifndef lint
-static const char *rcsid = "$OpenBSD: main.c,v 1.2 1996/06/04 08:43:35 niklas Exp $";
+static const char *rcsid = "$OpenBSD: main.c,v 1.3 1996/12/29 12:18:27 graichen Exp $";
 #endif
 
 /*
@@ -94,6 +94,10 @@ main(int argc, char **argv)
            break;
 
        case 'X':
+         /* XXX this won't work until someone adds the gtar -X option
+            (--exclude-from-file) to paxtar - so long it is disabled
+            in perform.c */
+           printf("WARNING: the -X option is not supported in OpenBSD\n");
            ExcludeFrom = optarg;
            break;
 

diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index d635ab0..2eac5e9 100644 (file)
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,7 +1,7 @@
-/*     $OpenBSD: perform.c,v 1.2 1996/06/04 08:43:36 niklas Exp $      */
+/*     $OpenBSD: perform.c,v 1.3 1996/12/29 12:18:28 graichen Exp $    */
 
 #ifndef lint
-static const char *rcsid = "$OpenBSD: perform.c,v 1.2 1996/06/04 08:43:36 niklas Exp $";
+static const char *rcsid = "$OpenBSD: perform.c,v 1.3 1996/12/29 12:18:28 graichen Exp $";
 #endif
 
 /*
@@ -187,7 +187,9 @@ make_dist(char *home, char *pkg, char *suffix, Package *plist)
     char tball[FILENAME_MAX];
     PackingList p;
     int ret, max, len;
-    char *args[50];    /* Much more than enough. */
+                        /* XXX - The next one should be 
+                          allocated dynamically  */
+    char *args[4096];  /* Much more than enough. */
     int nargs = 0;
     int pipefds[2];
     FILE *totar;
@@ -208,59 +210,47 @@ make_dist(char *home, char *pkg, char *suffix, Package *plist)
     if (Dereference)
        args[nargs++] = "-h";
     if (ExcludeFrom) {
+      /* XXX this won't work until someone adds the gtar -X option
+        (--exclude-from-file) to paxtar - so long it is disabled
+        here and a warning is printed in main.c
        args[nargs++] = "-X";
        args[nargs++] = ExcludeFrom;
+       */
     }
-    args[nargs++] = "-T";      /* Take filenames from file instead of args. */
-    args[nargs++] = "-";       /* Use stdin for the file. */
-    args[nargs] = NULL;
 
     if (Verbose)
-       printf("Creating gzip'd tar ball in '%s'\n", tball);
-
-    /* Set up a pipe for passing the filenames, and fork off a tar process. */
-    if (pipe(pipefds) == -1)
-       barf("Cannot create pipe: %s", strerror(errno));
-    if ((pid = fork()) == -1)
-       barf("Cannot fork process for tar: %s", strerror(errno));
-    if (pid == 0) {    /* The child */
-       dup2(pipefds[0], 0);
-       close(pipefds[0]);
-       close(pipefds[1]);
-       execv("/usr/bin/tar", args);
-       barf("Failed to execute tar command: %s", strerror(errno));
-    }
-
-    /* Meanwhile, back in the parent process ... */
-    close(pipefds[0]);
-    if ((totar = fdopen(pipefds[1], "w")) == NULL)
-       barf("fdopen failed: %s", strerror(errno));
-
-    fprintf(totar, "%s\n", CONTENTS_FNAME);
-    fprintf(totar, "%s\n", COMMENT_FNAME);
-    fprintf(totar, "%s\n", DESC_FNAME);
-
+        if (index(suffix, 'z'))
+           printf("Creating gzip'd tar ball in '%s'\n", tball);
+        else
+           printf("Creating tar ball in '%s'\n", tball);
+    args[nargs++] = CONTENTS_FNAME;
+    args[nargs++] = COMMENT_FNAME;
+    args[nargs++] = DESC_FNAME;
     if (Install)
-       fprintf(totar, "%s\n", INSTALL_FNAME);
+        args[nargs++] = INSTALL_FNAME;
     if (DeInstall)
-       fprintf(totar, "%s\n", DEINSTALL_FNAME);
+       args[nargs++] = DEINSTALL_FNAME;
     if (Require)
-       fprintf(totar, "%s\n", REQUIRE_FNAME);
+       args[nargs++] = REQUIRE_FNAME;
     if (Display)
-       fprintf(totar, "%s\n", DISPLAY_FNAME);
+       args[nargs++] = DISPLAY_FNAME;
     if (Mtree)
-       fprintf(totar, "%s\n", MTREE_FNAME);
+       args[nargs++] = MTREE_FNAME;
 
     for (p = plist->head; p; p = p->next) {
        if (p->type == PLIST_FILE)
-           fprintf(totar, "%s\n", p->name);
-       else if (p->type == PLIST_CWD || p->type == PLIST_SRC)
-           fprintf(totar, "-C\n%s\n", p->name);
+           args[nargs++] = p->name;
+       else if (p->type == PLIST_CWD || p->type == PLIST_SRC) {
+           args[nargs++] = "-C";
+           args[nargs++] = p->name;
+       }
        else if (p->type == PLIST_IGNORE)
             p = p->next;
     }
+    args[nargs] = NULL;
+    execv("/bin/tar", args);
+    barf("Failed to execute tar command: %s", strerror(errno));
 
-    fclose(totar);
     wait(&ret);
     /* assume either signal or bad exit is enough for us */
     if (ret)

diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 5ae3b99..bdf2b70 100644 (file)
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: pkg_create.1,v 1.2 1996/10/08 01:21:01 michaels Exp $ 
+.\"    $OpenBSD: pkg_create.1,v 1.3 1996/12/29 12:18:29 graichen Exp $ 
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -350,7 +350,7 @@ installed, and this package must be deinstalled before the
 .Ar pkgname
 package is deinstalled.  Multiple
 .Cm @pkgdep
-directives may be used if hte package depends on multiple other packages.
+directives may be used if the package depends on multiple other packages.
 .El
 .Sh SEE ALSO
 .Xr pkg_add 1 ,