Changeset 373

Timestamp:

04/17/05 13:10:33 (8 years ago)

Author:

ahu

Message:

implement --no-prompt for unattended usage, mostly useful for running
automated tests.

remove --verify from splitpipe

Location:

trunk/splitpipe

Files:

• Makefile (modified) (2 diffs)
• TODO (modified) (2 diffs)
• joinpipe.cc (modified) (5 diffs)
• splitpipe.cc (modified) (9 diffs)

trunk/splitpipe/Makefile

@@ -2 +2 @@
 OUTPUTDIR=splitpipe-$(VERSION)
 CXXFLAGS=-Wall -g -O2 -DVERSION=\"$(VERSION)\"
+PREFIX?=/usr/local/
+BINDIR?=$(DESTDIR)/$(PREFIX)/bin/
+
 
 all: splitpipe joinpipe
@@ -40 +43 @@
 
 install:
-        install -s splitpipe $(DESTDIR)/usr/local/bin
-        install -s joinpipe $(DESTDIR)/usr/local/bin
+        install -s splitpipe $(BINDIR)
+        install -s joinpipe $(BINDIR)

trunk/splitpipe/TODO

@@ -12 +12 @@
         - take out getopt_long stuff, it is somewhat ugly
 
-        - make buildStretch, which appends stretches to a string
+DONE!   - make buildStretch, which appends stretches to a string
 
 DONE!   - teach writen about EAGAIN
@@ -23 +23 @@
 
         - add "name" chunk stretch
+
+        - manpages
+
+        - i18n
+

trunk/splitpipe/joinpipe.cc

@@ -35 +35 @@
 using namespace std;
 
-struct params
-{
-  params()
+namespace {
+  struct params
   {
-    verbose=debug=verify=false;
-  }
-  
-  bool verbose;
-  bool debug;
-  bool verify;
-  vector<string> inputDevice;
-}parameters;
+    params()
+    {
+    verbose = debug = verify = noPrompt = false;
+    }
+    
+    bool verbose;
+    bool debug;
+    bool verify;
+    bool noPrompt;
+    vector<string> inputDevice;
+  }parameters;
+}
 
 void usage()
@@ -54 +57 @@
   cerr<<" --debug, -d\t\tGive debugging output\n";
   cerr<<" --help, -h\t\tGive this helpful message\n";
+  cerr<<" --no-prompt, -h\tRun without user intervention\n";
   cerr<<" --verbose, -v\t\tGive verbose output\n";
-  cerr<<" --verify, -t\t\tOnly verify an archive\n";
   cerr<<" --version\t\tReport version\n\n";
   
@@ -71 +74 @@
       {"help", 0, 0, 'h'},
       {"verbose", 0, 0, 'v'},
-      {"verify", 0, 0, 't'},
+      {"no-prompt", 0, 0, 'n'},
       {"version", 0, 0, 'e'},
       {0, 0, 0, 0}
     };
     
-    c = getopt_long (argc, argv, "dhv",
+    c = getopt_long (argc, argv, "dhnv",
                      long_options, &option_index);
     if (c == -1)
@@ -86 +89 @@
       break;
     case 'e':
-      cerr<<"joinpipe "VERSION" (C) 2005 Netherlabs Computer Consulting BV"<<endl;
+      cerr<<"joinpipe "VERSION" (C) 2005 Netherlabs Computer Consulting BV\nReport bugs to bert hubert <ahu@ds9a.nl>"<<endl;
       exit(EXIT_SUCCESS);
     case 'h':
       usage();
       break;
-    case 't':
-      parameters.verify=1;
+
+    case 'n':
+      parameters.noPrompt=1;
+      break;
+
     case 'v':
       parameters.verbose=true;
+      break;
+    case '?':
+      usage();
       break;
     }
@@ -173 +182 @@
       cerr<<"joinpipe: end of volume, change media and press enter"<<endl;
 
-      waitForUser();
+      if(!parameters.noPrompt)
+        waitForUser();
 
       if(inputIter + 1 != parameters.inputDevice.end())

trunk/splitpipe/splitpipe.cc

@@ -32 +32 @@
 #include "md5.hh"
 
-struct {
-  size_t bufferSize;
-  uint64_t volumeSize;
-  bool verbose;
-  bool debug;
-  string outputCommand;
-} parameters;
+namespace {
+  struct paramStruct {
+    paramStruct() 
+    {
+      bufferSize = 0;
+      volumeSize = 0;
+      verbose = debug = noPrompt = false;
+    }
+  
+    size_t bufferSize;
+    uint64_t volumeSize;
+    bool verbose;
+    bool debug;
+    bool noPrompt;
+    string outputCommand;
+  } parameters;
+}
 
 
@@ -105 +115 @@
   cerr<<" --volume-size, -s\tSize of output volumes, in kilobytes. See below"<<endl;
   cerr<<" --help, -h\t\tGive this helpful message"<<endl;
+  cerr<<" --no-prompt, -h\tRun without user intervention\n";
   cerr<<" --output, -o\t\tThe output script that will be spawned for each volume"<<endl;
   cerr<<" --verbose, -v\t\tGive verbose output\n";
@@ -125 +136 @@
       {"buffer-size", 1, 0, 'b'},
       {"volume-size", 1, 0, 's'},
+      {"no-prompt", 0, 0, 'n'},
       {"output", 1, 0, 'o'},
       {"debug", 0, 0, 'd'},
@@ -133 +145 @@
     };
     
-    c = getopt_long (argc, argv, "b:s:deho:v",
+    c = getopt_long (argc, argv, "b:ns:deho:v",
                      long_options, &option_index);
     if (c == -1)
@@ -149 +161 @@
       break;
     case 'e':
-      cerr<<"splitpipe "VERSION" (C) 2005 Netherlabs Computer Consulting BV"<<endl;
+      cerr<<"splitpipe "VERSION" (C) 2005 Netherlabs Computer Consulting BV\nReport bugs to bert hubert <ahu@ds9a.nl>"<<endl;
       exit(EXIT_SUCCESS);
     case 'h':
@@ -157 +169 @@
       parameters.outputCommand=optarg;
       break;
+    case 'n':
+      parameters.noPrompt=1;
+      break;
+
     case 'v':
       parameters.verbose=true;
+      break;
+
+    case '?':
+      usage();
       break;
     }
@@ -205 +225 @@
 }
 
+void appendStretch(int type, const string& content, string& stretches)
+{
+  struct stretchHeader stretch;
+  stretch.type=type;
+  stretch.size=htons(content.size());
+
+  char *p=(char*) &stretch;
+  stretches+=string(p, p + sizeof(stretch));
+  stretches+=content;
+}
+
 void outputChecksum(int outputfd, const MD5Summer& md5)
 {
-  struct stretchHeader stretch;
-  string md5sum=md5.get();
-  stretch.size=htons(md5sum.length());
-  stretch.type=stretchHeader::MD5Checksum;
-  
-  int ret=writen(outputfd, &stretch, sizeof(stretch),"write of meta-data to output command");
+  string stretches;
+  appendStretch(stretchHeader::MD5Checksum, md5.get(), stretches);
+
+  int ret=writen(outputfd, stretches.c_str(), stretches.length(), "write of meta-data to output command");
   
   if(!ret)
     outputGaveEof(outputfd);
-  
-  ret=writen(outputfd, md5sum.c_str(), md5sum.length(), "write of meta-data to output command");
-  
+}
+
+string g_uuid;
+
+int outputPerVolumeStretches(int fd, uint16_t volumeNumber)
+{
+  string stretches;
+  
+  appendStretch(stretchHeader::SessionUUID, g_uuid, stretches);
+
+  volumeNumber = htons(volumeNumber);
+  const string volNumString((char*)&volumeNumber, ((char*)&volumeNumber) + 2);
+  
+  appendStretch(stretchHeader::VolumeNumber,volNumString, stretches);
+
+  int ret=writen(fd, stretches.c_str(), stretches.length(), "write of per-volume meta-data to output command");
+
   if(!ret)
-    outputGaveEof(outputfd);
-}
-
-string g_uuid;
-
-int outputPerVolumeStretches(int fd, uint16_t volumeNumber)
-{
-  struct stretchHeader stretch;
-  stretch.type=stretchHeader::SessionUUID;
-  stretch.size=htons(g_uuid.length());
-
-  if(!writen(fd, &stretch, sizeof(stretch), "write of Session UUID"))
     outputGaveEof(fd);
 
-  if(!writen(fd, g_uuid.c_str(), g_uuid.length(), "write of Session UUID"))
-    outputGaveEof(fd);
-
-  stretch.type=stretchHeader::VolumeNumber;
-  stretch.size=htons(2);
-  
-  volumeNumber = htons(volumeNumber);
-  if(!writen(fd, &stretch, sizeof(stretch), "write of volume number"))
-    outputGaveEof(fd);
-
-  if(!writen(fd, &volumeNumber, 2, "write of volume number"))
-    outputGaveEof(fd);
-
-
-  return 2 * sizeof(stretch) + g_uuid.length() + 2;
+  return stretches.length();
 }
 
@@ -255 +272 @@
 try
 {
-  parameters.debug=parameters.verbose=false;
   parameters.bufferSize=1000000;
   parameters.volumeSize=getSize("DVD-5");
@@ -324 +340 @@
       else {
         cerr<<"splitpipe: reload media, if necessary, and press enter to continue"<<endl;
-        waitForUser();
+        if(!parameters.noPrompt)
+          waitForUser();
       }