Changeset a569125 in freewrt for tools/paxmirabilis/src/ftree.c

Timestamp:

Feb 16, 2012, 10:14:16 PM (14 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

7417b08

Parents:

3784d08

Message:

even FreeWRT 1.0-stable deserves paxmirabilis-20120216 compiled with LTO ☺

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@3981 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/paxmirabilis/src/ftree.c (modified) (7 diffs)

tools/paxmirabilis/src/ftree.c

@@ -1 @@
-/*      $OpenBSD: ftree.c,v 1.27 2006/12/26 20:58:25 otto Exp $ */
+/*      $OpenBSD: ftree.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $      */
 /*      $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $    */
 
@@ -48 +48 @@
 #include "extern.h"
 
-__SCCSID("@(#)ftree.c   8.2 (Berkeley) 4/18/94");
-__RCSID("$MirOS: src/bin/pax/ftree.c,v 1.3 2007/10/23 20:07:42 tg Exp $");
+__RCSID("$MirOS: src/bin/pax/ftree.c,v 1.5 2012/02/12 00:44:57 tg Exp $");
 
 /*
@@ -79 +78 @@
 /*
  * ftree_start()
- *      initialize the options passed to fts_open() during this run of pax
+ *      initialise the options passed to fts_open() during this run of pax
  *      options are based on the selection of pax options by the user
  *      fts_start() also calls fts_arg() to open the first valid file arg. We
@@ -165 +164 @@
         ft->fname = str;
         ft->refcnt = 0;
+        ft->newercnt = 0;
         ft->chflg = chflg;
         ft->fow = NULL;
@@ -210 +210 @@
 
 /*
+ * ftree_skipped_newer()
+ *      file has been skipped because a newer file exists and -u/-D given
+ */
+
+void
+ftree_skipped_newer(void)
+{
+        /* skipped due to -u/-D, mark accordingly */
+        if (ftcur != NULL)
+                ftcur->newercnt = 1;
+}
+
+/*
  * ftree_chk()
  *      called at end on pax execution. Prints all those file args that did not
@@ -232 +245 @@
          */
         for (ft = fthead; ft != NULL; ft = ft->fow) {
-                if ((ft->refcnt > 0) || ft->chflg)
+                if ((ft->refcnt > 0) || ft->newercnt > 0 || ft->chflg)
                         continue;
                 if (wban == 0) {
@@ -411 +424 @@
                 /*
                  * ok got a file tree node to process. copy info into arcn
-                 * structure (initialize as required)
+                 * structure (initialise as required)
                  */
                 arcn->skip = 0;