Changeset 207

Timestamp:

07/16/06 18:17:53 (6 years ago)

Author:

tg

Message:

sync with MirCpio?: introduce "extract to stdout" option

"schön" wbx@

Files:

• trunk/freewrt/tools/paxmirabilis/src/ar_subs.c (modified) (9 diffs)
• trunk/freewrt/tools/paxmirabilis/src/options.c (modified) (10 diffs)
• trunk/freewrt/tools/paxmirabilis/src/options.h (modified) (2 diffs)
• trunk/freewrt/tools/paxmirabilis/src/tar.1 (modified) (2 diffs)

trunk/freewrt/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 @@
- */
-
-
-
-
-
-
-
-
-
-
+
-#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))
-
+!to_stdout && 
-                                syswarn(1, errno, "Cannot chdir to %s",
-                                    arcn->pat->chdname);
@@ -315 +311 @@
-                         * header (as determined by the format).
-                         */
-
-
-
-
+
+
+
+
+
+
-
-                        (void)rd_skip(arcn->skip + arcn->pad);
@@ -334 +332 @@
-                 * over the data and purge the name from hard link table
-                 */
-
+
+
+
-                        (void)rd_skip(arcn->skip + arcn->pad);
-                        purg_lnk(arcn);
@@ -344 +344 @@
-                 */
-                res = (*frmt->rd_data)(arcn, fd, &cnt);
-
+
+
-                if (vflag && vfpart) {
-                        (void)putc('\n', listf);
@@ -356 +357 @@
-                 */
-                if ((arcn->pat != NULL) && (arcn->pat->chdname != NULL))
-
+!to_stdout && 
-                                syswarn(1, errno,
-                                    "Can't fchdir to starting directory");
@@ -398 +399 @@
-
-        /*
- 
+
-         * trailer
-         */

trunk/freewrt/tools/paxmirabilis/src/options.c

@@ -1 @@
-6 2006/06/23 23:03:56
+8 2006/07/16 16:14:50
-/*      $OpenBSD: options.c,v 1.64 2006/04/09 03:35:34 jaredy Exp $     */
-/*      $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $  */
@@ -58 +58 @@
-
-__SCCSID("@(#)options.c 8.2 (Berkeley) 4/18/94");
-6 2006/06/23 23:03:56
+8 2006/07/16 16:14:50
-
-/*
@@ -79 +79 @@
-static void cpio_options(int, char **);
-static void cpio_usage(void);
+int mkpath(char *);
-
-static void process_M(const char *, void (*)(void));
@@ -161 +162 @@
-int ford[] = {6, 5, 4, 3, 1, 0, -1 };
-
-Normalise archives?
+normalise archives
-int anonarch = 0;
+
+/* extract to standard output */
+int to_stdout = 0;
-
-/*
@@ -690 +694 @@
-                case 'O':
-                        Oflag = 1;
+                        to_stdout = 2;
-                        break;
-                case 'o':
@@ -858 +863 @@
-         */
-        switch (act) {
+        case EXTRACT:
+                if (to_stdout == 2)
+                        to_stdout = 1;
-        case LIST:
-        case EXTRACT:
-        default:
-                {
-                        int sawpat = 0;
-
+ = NULL
-
-                        while (nincfiles || *argv != NULL) {
@@ -955 +962 @@
-
-                while (nincfiles || *argv != NULL) {
-
+ = NULL
-
-                        /*
@@ -1016 +1023 @@
-                break;
-        }
+        if (to_stdout != 1)
+                to_stdout = 0;
-        if (!fstdin && ((arcname == NULL) || (*arcname == '\0'))) {
-                arcname = getenv("TAPE");
@@ -1024 +1033 @@
-        }
-}
-
-int mkpath(char *);
-
-int
@@ -1652 +1659 @@
-process_M(const char *arg, void (*call_usage)(void))
-{
-
+ = 0
-
-        if ((arg[0] >= '0') && (arg[0] <= '9')) {

trunk/freewrt/tools/paxmirabilis/src/options.h

@@ -1 @@
-2 2006/06/19 19:22:08
+3 2006/07/16 16:14:50
-/*      $OpenBSD: options.h,v 1.4 2003/06/13 17:51:14 millert Exp $     */
-/*      $NetBSD: options.h,v 1.3 1995/03/21 09:07:32 cgd Exp $  */
@@ -127 +127 @@
-extern int anonarch;
-void anonarch_init(void);
+
+extern int to_stdout;

trunk/freewrt/tools/paxmirabilis/src/tar.1

@@ -1 @@
-6 2006/06/19 20:31:05
+7 2006/07/16 16:14:50
-.\"     $OpenBSD: tar.1,v 1.47 2005/05/24 16:33:45 jaredy Exp $
-.\"
@@ -196 +196 @@
-Do not preserve modification time.
-.It Fl O
-
+
+
+
-.It Fl o
-Don't write directory information that the older (V7) style