Changeset dbbcad4 in freewrt for tools/paxmirabilis/src/ar_subs.c

Timestamp:

Jul 16, 2006, 6:17:53 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

006f3d5

Parents:

53c89c6

Message:

sync with MirCpio: introduce "extract to stdout" option

"schön" wbx@

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@207 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/paxmirabilis/src/ar_subs.c (modified) (9 diffs)

tools/paxmirabilis/src/ar_subs.c

@@ +1 @@
+/**     $MirOS: src/bin/pax/ar_subs.c,v 1.4 2006/07/16 16:14:50 tg Exp $ */
 /*      $OpenBSD: ar_subs.c,v 1.29 2006/01/25 17:42:08 markus Exp $     */
 /*      $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $  */
@@ -35 +36 @@
  */
 
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ar_subs.c     8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.29 2006/01/25 17:42:08 markus Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <signal.h>
 #include <string.h>
@@ -56 +48 @@
 #include "pax.h"
 #include "extern.h"
+#include "options.h"
+
+__SCCSID("@(#)ar_subs.c 8.2 (Berkeley) 4/18/94");
+__RCSID("$MirOS: src/bin/pax/ar_subs.c,v 1.4 2006/07/16 16:14:50 tg Exp $");
 
 static void wr_archive(ARCHD *, int is_app);
@@ -302 +298 @@
                  */
                 if ((arcn->pat != NULL) && (arcn->pat->chdname != NULL))
-                        if (chdir(arcn->pat->chdname) != 0)
+                        if (!to_stdout && chdir(arcn->pat->chdname) != 0)
                                 syswarn(1, errno, "Cannot chdir to %s",
                                     arcn->pat->chdname);
@@ -315 +311 @@
                          * header (as determined by the format).
                          */
-                        if ((arcn->type == PAX_HLK) || (arcn->type == PAX_HRG))
-                                res = lnk_creat(arcn);
-                        else
-                                res = node_creat(arcn);
+                        if (!to_stdout) {
+                                if ((arcn->type == PAX_HLK) || (arcn->type == PAX_HRG))
+                                        res = lnk_creat(arcn);
+                                else
+                                        res = node_creat(arcn);
+                        }
 
                         (void)rd_skip(arcn->skip + arcn->pad);
@@ -334 +332 @@
                  * over the data and purge the name from hard link table
                  */
-                if ((fd = file_creat(arcn)) < 0) {
+                if (to_stdout)
+                        fd = STDOUT_FILENO;
+                else if ((fd = file_creat(arcn)) < 0) {
                         (void)rd_skip(arcn->skip + arcn->pad);
                         purg_lnk(arcn);
@@ -344 +344 @@
                  */
                 res = (*frmt->rd_data)(arcn, fd, &cnt);
-                file_close(arcn, fd);
+                if (fd != STDOUT_FILENO)
+                        file_close(arcn, fd);
                 if (vflag && vfpart) {
                         (void)putc('\n', listf);
@@ -356 +357 @@
                  */
                 if ((arcn->pat != NULL) && (arcn->pat->chdname != NULL))
-                        if (fchdir(cwdfd) != 0)
+                        if (!to_stdout && fchdir(cwdfd) != 0)
                                 syswarn(1, errno,
                                     "Can't fchdir to starting directory");
@@ -398 +399 @@
 
         /*
-         * if this is not append, and there are no files, we do not write a 
+         * if this is not append, and there are no files, we do not write a
          * trailer
          */