mtree/fileflags.diff

   1 --- compare.c.orig      2010-12-07 16:46:13.806666676 -0430
   2 +++ compare.c   2010-12-07 16:46:47.510000009 -0430
   3 @@ -108,7 +108,7 @@
   4  } while (0)
   5  #define        LABEL if (!label++) MARK
   6
   7 -#if HAVE_STRUCT_STAT_ST_FLAGS
   8 +#if HAVE_FILE_FLAGS
   9
  10
  11  #define CHANGEFLAGS                                                    \
  12 @@ -198,7 +198,7 @@
  13         }
  14         if (mtree_Wflag)
  15                 goto afterpermwhack;
  16 -#if HAVE_STRUCT_STAT_ST_FLAGS
  17 +#if HAVE_FILE_FLAGS
  18         if (iflag && !uflag) {
  19                 if (s->flags & F_FLAGS)
  20                     SETFLAGS(p->fts_statp->st_flags, SP_FLGS);
  21 @@ -354,7 +354,7 @@
  22                         tab = "\t";
  23                 }
  24         }
  25 -#if HAVE_STRUCT_STAT_ST_FLAGS
  26 +#if HAVE_FILE_FLAGS
  27         /*
  28          * XXX
  29          * since lchflags(2) will reset file times, the utimes() above
  30 --- create.c.orig       2010-12-07 16:46:13.810000010 -0430
  31 +++ create.c    2010-12-07 16:46:47.520000011 -0430
  32 @@ -283,7 +283,7 @@
  33         if (keys & F_SLINK &&
  34             (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
  35                 output(&indent, "link=%s", vispath(rlink(p->fts_accpath)));
  36 -#if HAVE_STRUCT_STAT_ST_FLAGS
  37 +#if HAVE_FILE_FLAGS
  38         if (keys & F_FLAGS && p->fts_statp->st_flags != flags)
  39                 output(&indent, "flags=%s",
  40                     flags_to_string(p->fts_statp->st_flags, "none"));
  41 @@ -300,7 +300,7 @@
  42  #define        MTREE_MAXGID    5000
  43  #define        MTREE_MAXUID    5000
  44  #define        MTREE_MAXMODE   (MBITS + 1)
  45 -#if HAVE_STRUCT_STAT_ST_FLAGS
  46 +#if HAVE_FILE_FLAGS
  47  #define        MTREE_MAXFLAGS  (FLAGS2INDEX(CH_MASK) + 1)   /* 1808 */
  48  #else
  49  #define MTREE_MAXFLAGS 1
  50 @@ -359,7 +359,7 @@
  51                         maxuid = u[suid];
  52                 }
  53
  54 -#if HAVE_STRUCT_STAT_ST_FLAGS
  55 +#if HAVE_FILE_FLAGS
  56                 sflags = FLAGS2INDEX(p->fts_statp->st_flags);
  57                 if (sflags < MTREE_MAXFLAGS && ++f[sflags] > maxflags) {
  58                         saveflags = p->fts_statp->st_flags;
  59 --- stat_flags.c.orig   2010-12-07 16:46:13.813333344 -0430
  60 +++ stat_flags.c        2010-12-07 16:46:47.523333345 -0430
  61 @@ -88,7 +88,7 @@
  62
  63         string[0] = '\0';
  64         prefix = NULL;
  65 -#if HAVE_STRUCT_STAT_ST_FLAGS
  66 +#if HAVE_FILE_FLAGS
  67         if (flags & UF_APPEND)
  68                 SAPPEND("uappnd");
  69         if (flags & UF_IMMUTABLE)
  70 @@ -147,7 +147,7 @@
  71         if (clrp)
  72                 *clrp = 0;
  73
  74 -#if HAVE_STRUCT_STAT_ST_FLAGS
  75 +#if HAVE_FILE_FLAGS
  76         string = *stringp;
  77         while ((p = strsep(&string, "\t ,")) != NULL) {
  78                 clear = 0;
  79 --- verify.c.orig       2010-12-07 16:46:13.816666678 -0430
  80 +++ verify.c    2010-12-07 16:46:47.533333344 -0430
  81 @@ -300,7 +300,7 @@
  82                                 printf("%s: permissions not set: %s\n",
  83                                     path, strerror(errno));
  84                 }
  85 -#if HAVE_STRUCT_STAT_ST_FLAGS
  86 +#if HAVE_FILE_FLAGS
  87                 if ((p->flags & F_FLAGS) && p->st_flags) {
  88                         if (iflag)
  89                                 flags = p->st_flags;