Changeset 384

Show
Ignore:
Timestamp:
04/19/05 20:10:07 (8 years ago)
Author:
ahu
Message:

reorder TODO file, make joinpipe and splitpipe 1 binary

Location:
trunk/splitpipe
Files:
1 added
6 modified

Legend:

Unmodified
Added
Removed
  • trunk/splitpipe/Makefile

    r375 r384  
    1717 
    1818 
    19  
    2019clean: 
    2120        rm -rf *~ *.o splitpipe  
     
    2423 
    2524common_OBJECTS=misc.o md5.o 
    26 splitpipe_OBJECTS=splitpipe.o $(common_OBJECTS) 
    27 joinpipe_OBJECTS=joinpipe.o $(common_OBJECTS) 
     25splitpipe_OBJECTS=splitpipe.o joinpipe.o main.o $(common_OBJECTS) 
    2826 
    2927splitpipe: $(splitpipe_OBJECTS) 
    3028        g++ $(splitpipe_OBJECTS) -o $@ 
    3129 
    32 joinpipe: $(joinpipe_OBJECTS) 
    33         g++ $(joinpipe_OBJECTS) -o $@ 
    34  
     30joinpipe: splitpipe 
     31        ln -f splitpipe joinpipe 
    3532 
    3633check: all 
     
    4845install: 
    4946        install -s splitpipe $(BINDIR) 
    50         install -s joinpipe $(BINDIR) 
     47        ln -f $(BINDIR)/splitpipe $(BINDIR)/joinpipe 
  • trunk/splitpipe/THANKS

    r377 r384  
    22Reinoud van Leeuwen 
    33Stuart Rackham (for AsciiDoc) 
     4Nero Imhard 
  • trunk/splitpipe/TODO

    r379 r384  
    1         - perhaps merge split and joinpipe (suggestion of "Kei" and Mel Roman) 
     1EASY: 
     2        - figure out exact byte sizes of CDR, CDR-80, DVD 
    23 
     4MEDIUM: 
     5        - add date/time session stretch 
     6 
     7        - add "name" chunk stretch 
     8 
     9DONE!   - perhaps merge split and joinpipe (suggestion of "Kei" and Mel Roman) 
     10 
     11        - i18n 
     12 
     13HARD: 
    314        - output of cdrecord is fugly, perhaps add --cdrecord for prettifying 
    415 
     
    819        - implement retry in joinpipe 
    920 
    10 hmm     - write dvdrecord-script 
    11  
    1221        - define environment variables 
    1322         
    1423        - take out getopt_long stuff, it is somewhat ugly 
     24 
     25        - open /dev/tty and poll it in the loop 
     26 
     27        - allow single key commands during the process 
     28 
     29Done: 
    1530 
    1631DONE!   - make buildStretch, which appends stretches to a string 
     
    1833DONE!   - teach writen about EAGAIN 
    1934 
    20         - open /dev/tty and poll it in the loop 
    21  
    22         - allow single key commands during the process 
    23  
    24         - add date/time session stretch 
    25  
    26         - add "name" chunk stretch 
    27  
    2835DONE!   - manpages 
    2936 
    30         - i18n 
     37hmm     - write dvdrecord-script 
    3138 
     39 
  • trunk/splitpipe/joinpipe.cc

    r375 r384  
    5151} 
    5252 
    53 void usage() 
     53static void usage() 
    5454{ 
    5555  cerr<<"joinpipe joins multiple volumes (volumes) into one pipe.\n"; 
     
    6464} 
    6565 
    66 void ParseCommandline(int argc, char** argv) 
     66static void ParseCommandline(int argc, char** argv) 
    6767{ 
    6868  int c; 
     
    115115} 
    116116 
    117 int main(int argc, char** argv) 
     117int JoinpipeMain(int argc, char** argv) 
    118118try 
    119119{ 
     
    210210    } 
    211211  } 
     212  return EXIT_SUCCESS; 
    212213} 
    213214catch(exception &e) 
    214215{ 
    215216  cerr<<"Fatal: "<<e.what()<<endl; 
    216 } 
     217  return EXIT_FAILURE; 
     218} 
  • trunk/splitpipe/misc.hh

    r375 r384  
    2222} __attribute__((packed)); 
    2323 
     24int SplitpipeMain(int argc, char** argv); 
     25int JoinpipeMain(int argc, char** argv); 
     26 
    2427#endif 
  • trunk/splitpipe/splitpipe.cc

    r375 r384  
    108108} 
    109109 
    110 void usage() 
     110static void usage() 
    111111{ 
    112112  cerr<<"splitpipe divides its input over several volumes.\n"; 
     
    127127} 
    128128 
    129 void ParseCommandline(int argc, char** argv) 
     129static void ParseCommandline(int argc, char** argv) 
    130130{ 
    131131  int c; 
     
    269269 
    270270 
    271 int main(int argc, char** argv) 
     271int SplitpipeMain(int argc, char** argv) 
    272272try 
    273273{ 
     
    498498  if(parameters.verbose) 
    499499    cerr<<"splitpipe: output "<<numStretches<<" stretches\n"; 
     500  return EXIT_SUCCESS; 
    500501} 
    501502catch(exception &e) 
    502503{ 
    503504  cerr<<"Fatal: "<<e.what()<<endl; 
    504 } 
     505  return EXIT_FAILURE; 
     506}