Attachment 15104 Details for Bug 28095 – file.diff

[patch] file.diff

file.diff (text/plain), 1.96 KB, created by bill on 2001-06-12 11:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bill

Created: 2001-06-12 11:10:01 UTC

Size: 1.96 KB

patch

obsolete

>diff -bru pax.orig/ar_subs.c pax/ar_subs.c
>--- pax.orig/ar_subs.c  Fri Aug 27 16:14:39 1999
>+++ pax/ar_subs.c       Tue Jun 12 02:53:37 2001
>@@ -395,8 +395,10 @@
>                /*
>                 * check if this file meets user specified options match.
>                 */
>-               if (sel_chk(arcn) != 0)
>+               if (sel_chk(arcn) != 0) {
>+                       ftree_notsel(arcn);
>                        continue;
>+               }
>                fd = -1;
>                if (uflag) {
>                        /*
>@@ -791,9 +793,10 @@
>                /*
>                 * check if this file meets user specified options
>                 */
>-               if (sel_chk(arcn) != 0)
>+               if (sel_chk(arcn) != 0) {
>+                       ftree_notsel(arcn);
>                        continue;
>-
>+               }
>                /*
>                 * if there is already a file in the destination directory with
>                 * the same name and it is newer, skip the one stored on the
>diff -bru pax.orig/extern.h pax/extern.h
>--- pax.orig/extern.h   Mon Mar  5 04:30:41 2001
>+++ pax/extern.h        Tue Jun 12 02:48:42 2001
>@@ -157,6 +157,7 @@
> int ftree_start __P((void));
> int ftree_add __P((register char *));
> void ftree_sel __P((register ARCHD *));
>+void ftree_notsel __P((register ARCHD *));
> void ftree_chk __P((void));
> int next_file __P((register ARCHD *));
> 
>diff -bru pax.orig/ftree.c pax/ftree.c
>--- pax.orig/ftree.c    Fri Aug 27 16:14:42 1999
>+++ pax/ftree.c Tue Jun 12 02:48:21 2001
>@@ -234,6 +234,24 @@
> }
> 
> /*
>+ * ftree_notsel()
>+ *      this entry has been skipped by pax.
>+ */
>+
>+#if __STDC__
>+void
>+ftree_notsel(register ARCHD *arcn)
>+#else
>+void
>+ftree_notsel(arcn)
>+       register ARCHD *arcn;
>+#endif
>+{
>+       if (ftent != NULL)
>+               (void)fts_set(ftsp, ftent, FTS_SKIP);
>+}
>+
>+/*
>  * ftree_chk()
>  *     called at end on pax execution. Prints all those file args that did not
>  *     have a selected member (reference count still 0)

Actions: View | Diff

Attachments on bug 28095: 15104