X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=cprogs%2Fsummer.c;h=6a1bc3d9bb5106f0e67126fda719cc252a1bfe31;hp=5e85111218c6a35567604c31edf2739c3d91adea;hb=2b3cc36bdcf6cf04e27ce95bcc00d8e3a78f5d30;hpb=81c1c5a8731555d6f1d67b3d834356619907e3a1

diff --git a/cprogs/summer.c b/cprogs/summer.c
index 5e85111..6a1bc3d 100644
--- a/cprogs/summer.c
+++ b/cprogs/summer.c
@@ -1,9 +1,29 @@
 /*
+ * summer - program for summarising (with md5 checksums) filesystem trees
+ *
  * usage:
  *    cat startpoints.list | summer >data.list
  *    summer startpoints... >data.list
  *  prints md5sum of data-list to stderr
  */
+/*
+ * Copyright (C) 2003,2006-2007 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
+ */
 
 #define _GNU_SOURCE
 
@@ -26,8 +46,8 @@
 #define MAXDEPTH 1024
 #define CSUMXL 32
 
-static int quiet=0, hidectime=0, hideatime=0;
-static int hidedirsize=0, hidelinkmtime=0, onefilesystem=0;
+static int quiet=0, hidectime=0, hideatime=0, hidemtime=0;
+static int hidedirsize=0, hidelinkmtime=0, hidextime=0, onefilesystem=0;
 static int filenamefieldsep=' ';
 static FILE *errfile;
 
@@ -143,6 +163,28 @@ static void linktargpath(const char *linktarg) {
   fn_escaped(stdout, linktarg);
 }
 
+static void pu10(void) { printf(" %10s", "?"); }
+
+#define PTIME(stab, memb)  ((stab) ? ptime((stab), (stab)->memb) : pu10())
+
+static void ptime(const struct stat *stab, unsigned long val) {
+  const char *instead;
+
+  if (!hidextime) goto justprint;
+  else if (S_ISCHR(stab->st_mode)) instead= "char";
+  else if (S_ISBLK(stab->st_mode)) instead= "block";
+  else if (S_ISLNK(stab->st_mode)) instead= "link";
+  else if (S_ISSOCK(stab->st_mode)) instead= "sock";
+  else if (S_ISFIFO(stab->st_mode)) instead= "pipe";
+  else {
+  justprint:
+    printf(" %10lu", val);
+    return;
+  }
+
+  printf(" %10s",instead);
+}
+
 struct hardlink {
   dev_t dev;
   ino_t ino;
@@ -150,8 +192,6 @@ struct hardlink {
 };
 static void *hardlinks;
 
-static void pu10(void) { printf(" %10s", "?"); }
-
 static int hardlink_compar(const void *av, const void *bv) {
   const struct hardlink *a=av, *b=bv;
   if (a->ino != b->ino) return b->ino - a->ino;
@@ -230,31 +270,19 @@ static void node(const char *path, unsigned nodeflags, dev_t fs) {
     printf(" %10s %4s %10s %10s", "?","?","?","?");
   }
 
-  if (!hideatime) {
-    if (stab)
-      printf(" %10lu",
-	     (unsigned long)stab->st_atime);
-    else
-      pu10();
-  }
+  if (!hideatime)
+    PTIME(stab, st_atime);
 
-  if (stab)
-    if (S_ISLNK(stab->st_mode) && hidelinkmtime)
+  if (!hidemtime) {
+    if (stab && S_ISLNK(stab->st_mode) && hidelinkmtime)
       printf(" %10s","link");
     else
-      printf(" %10lu",
-	     (unsigned long)stab->st_mtime);
-  else
-    pu10();
-
-  if (!hidectime) {
-    if (stab)
-      printf(" %10lu",
-	     (unsigned long)stab->st_ctime);
-    else
-      pu10();
+      PTIME(stab, st_mtime);
   }
 
+  if (!hidectime)
+    PTIME(stab, st_ctime);
+
   putchar(filenamefieldsep);
   fn_escaped(stdout, path);
 
@@ -359,7 +387,7 @@ int main(int argc, const char *const *argv) {
 
   errfile= stderr;
   
-  if ((arg=argv[1]) && *arg++=='-') {
+  while ((arg=argv[1]) && *arg++=='-') {
     while ((c=*arg++)) {
       switch (c) {
       case 'h':
@@ -379,6 +407,9 @@ int main(int argc, const char *const *argv) {
       case 'b':
 	hidelinkmtime= 1;
 	break;
+      case 'B':
+	hidextime= 1;
+	break;
       case 'x':
 	onefilesystem= 1;
 	break;
@@ -388,6 +419,9 @@ int main(int argc, const char *const *argv) {
       case 'A':
 	hideatime= 1;
 	break;
+      case 'M':
+	hidemtime= 1;
+	break;
       case 'f':
 	errfile= stdout;
 	break;