X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=cpmcp.c;h=bf7c7262d6bd66c9a77a452eabba37e2a0207418;hb=e7957d2038ed5ba72efec92aff70352064988d13;hp=61dc65b6fd69621dc79ddf3e9277747ee5308aa8;hpb=32087c67d53a8f8058b359388f23e2dbc9436d54;p=debian%2Fcpmtools

diff --git a/cpmcp.c b/cpmcp.c
index 61dc65b..bf7c726 100644
--- a/cpmcp.c
+++ b/cpmcp.c
@@ -1,29 +1,23 @@
 /* #includes */ /*{{{C}}}*//*{{{*/
-#undef  _POSIX_SOURCE
-#define _POSIX_SOURCE   1
-#undef  _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 2
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
+#include "config.h"
 
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "config.h"
+#include <time.h>
 
-#include "getopt.h"
+#include "getopt_.h"
 #include "cpmfs.h"
 /*}}}*/
 
 const char cmd[]="cpmcp";
 static int text=0;
+static int preserve=0;
 
 /**
  * Return the user number.
@@ -33,7 +27,7 @@ static int text=0;
 static int userNumber(const char *s) /*{{{*/
 {
   if (isdigit(*s) && *(s+1)==':') return (*s-'0');
-  if (isdigit(*s) && isdigit(*(s+1)) && *(s+2)==':') return (10*(*s-'0')+(*(s+1)));
+  if (isdigit(*s) && isdigit(*(s+1)) && *(s+2)==':') return (10*(*s-'0')+(*(s+1)-'0'));
   return -1;
 }
 /*}}}*/
@@ -50,64 +44,73 @@ static int cpmToUnix(const struct cpmInode *root, const char *src, const char *d
   struct cpmInode ino;
   int exitcode=0;
 
-      if (cpmNamei(root,src,&ino)==-1) { fprintf(stderr,"%s: can not open %s: %s\n",cmd,src,boo); exitcode=1; }
-      else
+  if (cpmNamei(root,src,&ino)==-1) { fprintf(stderr,"%s: can not open `%s': %s\n",cmd,src,boo); exitcode=1; }
+  else
+  {
+    struct cpmFile file;
+    FILE *ufp;
+
+    cpmOpen(&ino,&file,O_RDONLY);
+    if ((ufp=fopen(dest,text ? "w" : "wb"))==(FILE*)0) { fprintf(stderr,"%s: can not create %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; }
+    else
+    {
+      int crpending=0;
+      int ohno=0;
+      ssize_t res;
+      char buf[4096];
+
+      while ((res=cpmRead(&file,buf,sizeof(buf)))>0)
       {
-        struct cpmFile file;
-        FILE *ufp;
+        int j;
 
-        cpmOpen(&ino,&file,O_RDONLY);
-        if ((ufp=fopen(dest,text ? "w" : "wb"))==(FILE*)0) { fprintf(stderr,"%s: can not create %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; }
-        else
+        for (j=0; j<res; ++j)
         {
-          int crpending=0;
-          int ohno=0;
-          int res;
-          char buf[4096];
-
-          while ((res=cpmRead(&file,buf,sizeof(buf)))!=0)
+          if (text)
           {
-            int j;
-
-            for (j=0; j<res; ++j)
+            if (buf[j]=='\032') goto endwhile;
+            if (crpending)
             {
-              if (text)
+              if (buf[j]=='\n') 
               {
-                if (buf[j]=='\032') goto endwhile;
-                if (crpending)
-                {
-                  if (buf[j]=='\n') 
-                  {
-                    if (putc('\n',ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
-                    crpending=0;
-                  }
-                  else if (putc('\r',ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
-                  crpending=(buf[j]=='\r');
-                }
-                else
-                {
-                  if (buf[j]=='\r') crpending=1;
-                  else if (putc(buf[j],ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
-                }
+                if (putc('\n',ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
+                crpending=0;
               }
+              else if (putc('\r',ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
+              crpending=(buf[j]=='\r');
+            }
+            else
+            {
+              if (buf[j]=='\r') crpending=1;
               else if (putc(buf[j],ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
             }
           }
-          endwhile:
-          if (fclose(ufp)==EOF && !ohno) { fprintf(stderr,"%s: can not close %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; }
+          else if (putc(buf[j],ufp)==EOF) { fprintf(stderr,"%s: can not write %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; goto endwhile; }
         }
-        cpmClose(&file);
       }
-      return exitcode;
+      endwhile:
+      if (res==-1 && !ohno) { fprintf(stderr,"%s: can not read %s (%s)\n",cmd,src,boo); exitcode=1; ohno=1; }
+      if (fclose(ufp)==EOF && !ohno) { fprintf(stderr,"%s: can not close %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; }
+      if (preserve && !ohno && (ino.atime || ino.mtime))
+      {
+        struct utimbuf ut;
+
+        if (ino.atime) ut.actime=ino.atime; else time(&ut.actime);
+        if (ino.mtime) ut.modtime=ino.mtime; else time(&ut.modtime);
+        if (utime(dest,&ut)==-1) { fprintf(stderr,"%s: can change timestamps of %s: %s\n",cmd,dest,strerror(errno)); exitcode=1; ohno=1; }
+      }
+    }
+    cpmClose(&file);
+  }
+  return exitcode;
 }
 /*}}}*/
 
 static void usage(void) /*{{{*/
 {
-  fprintf(stderr,"Usage: %s [-f format] [-t] image 0:file file\n",cmd);
-  fprintf(stderr,"       %s [-f format] [-t] image 0:file ... directory\n",cmd);
-  fprintf(stderr,"       %s [-f format] [-t] image file 0:file\n",cmd);
-  fprintf(stderr,"       %s [-f format] [-t] image file ... 0:\n",cmd);
+  fprintf(stderr,"Usage: %s [-f format] [-p] [-t] image user:file file\n",cmd);
+  fprintf(stderr,"       %s [-f format] [-p] [-t] image user:file ... directory\n",cmd);
+  fprintf(stderr,"       %s [-f format] [-p] [-t] image file user:file\n",cmd);
+  fprintf(stderr,"       %s [-f format] [-p] [-t] image file ... user:\n",cmd);
   exit(1);
 }
 /*}}}*/
@@ -117,35 +120,41 @@ int main(int argc, char *argv[])
   /* variables */ /*{{{*/
   const char *err;
   const char *image;
-  const char *format=FORMAT;
+  const char *format;
   const char *devopts=NULL;
+  int uppercase=0;
   int c,readcpm=-1,todir=-1;
   struct cpmInode root;
   struct cpmSuperBlock super;
   int exitcode=0;
+  int gargc;
+  char **gargv;
   /*}}}*/
 
   /* parse options */ /*{{{*/
-  while ((c=getopt(argc,argv,"T:f:h?t"))!=EOF) switch(c)
+  if (!(format=getenv("CPMTOOLSFMT"))) format=FORMAT;
+  while ((c=getopt(argc,argv,"T:f:ptuh?"))!=EOF) switch(c)
   {
     case 'T': devopts=optarg; break;
     case 'f': format=optarg; break;
+    case 'p': preserve=1; break;
+    case 't': text=1; break;
+    case 'u': uppercase=1; break;
     case 'h':
     case '?': usage(); break;
-    case 't': text=1; break;
   }
   /*}}}*/
   /* parse arguments */ /*{{{*/
   if ((optind+2)>=argc) usage();
-  image=argv[optind];
+  image=argv[optind++];
 
-  if (userNumber(argv[optind+1])>=0) /* cpm -> unix? */ /*{{{*/
+  if (userNumber(argv[optind])>=0) /* cpm -> unix? */ /*{{{*/
   {
     int i;
     struct stat statbuf;
 
-    for (i=optind+1; i<(argc-1); ++i) if (userNumber(argv[i])==-1) usage();
-    todir=((argc-optind-1)>2);
+    for (i=optind; i<(argc-1); ++i) if (userNumber(argv[i])==-1) usage();
+    todir=((argc-optind)>2);
     if (stat(argv[argc-1],&statbuf)==-1) { if (todir) usage(); }
     else if (S_ISDIR(statbuf.st_mode)) todir=1; else if (todir) usage();
     readcpm=1;
@@ -156,8 +165,8 @@ int main(int argc, char *argv[])
     int i;
 
     todir=0;
-    for (i=optind+1; i<(argc-1); ++i) if (userNumber(argv[i])>=0) usage();
-    if ((argc-optind-1)>2 && *(strchr(argv[argc-1],':')+1)!='\0') usage();
+    for (i=optind; i<(argc-1); ++i) if (userNumber(argv[i])>=0) usage();
+    if ((argc-optind)>2 && *(strchr(argv[argc-1],':')+1)!='\0') usage();
     if (*(strchr(argv[argc-1],':')+1)=='\0') todir=1;
     readcpm=0;
   }
@@ -167,64 +176,39 @@ int main(int argc, char *argv[])
   /* open image file */ /*{{{*/
   if ((err=Device_open(&super.dev,image,readcpm ? O_RDONLY : O_RDWR, devopts)))
   {
-    fprintf(stderr,"%s: can not open %s (%s)\n",cmd,image,err);
+    fprintf(stderr,"%s: cannot open %s (%s)\n",cmd,image,err);
+    exit(1);
+  }
+  if (cpmReadSuper(&super,&root,format,uppercase)==-1)
+  {
+    fprintf(stderr,"%s: cannot read superblock (%s)\n",cmd,boo);
     exit(1);
   }
-  cpmReadSuper(&super,&root,format);
   /*}}}*/
   if (readcpm) /* copy from CP/M to UNIX */ /*{{{*/
   {
-    int i,count,total=0;
-    char src[2+8+1+3+1];
-    struct cpmFile dir;
-    struct cpmDirent dirent;
-
-    /* expand pattern and check if we try to copy multiple files to a file */ /*{{{*/
-    for (i=optind+1,total=0; i<(argc-1); ++i)
-    {
-      cpmOpendir(&root,&dir);
-      count=0;
-      while (cpmReaddir(&dir,&dirent)) if (match(dirent.name,argv[i])) ++count;
-      if (count==0) ++total; else total+=count;
-      cpmClose(&dir);
-    }
-    if (total>1 && !todir) usage();
-    /*}}}*/
-
-    for (i=optind+1; i<(argc-1); ++i)
+    int i;
+    char *last=argv[argc-1];
+    
+    cpmglob(optind,argc-1,argv,&root,&gargc,&gargv);
+    /* trying to copy multiple files to a file? */
+    if (gargc>1 && !todir) usage();
+    for (i=0; i<gargc; ++i)
     {
       char dest[_POSIX_PATH_MAX];
 
-      count=0;
-      cpmOpendir(&root,&dir);
-      while (cpmReaddir(&dir,&dirent))
+      if (todir)
       {
-        if (match(dirent.name,argv[i]))
-        {
-          if (todir)
-          {
-            strcpy(dest,argv[argc-1]);
-            strcat(dest,"/");
-            strcat(dest,dirent.name+2);
-          }
-          else strcpy(dest,argv[argc-1]);
-          if (cpmToUnix(&root,dirent.name,dest)) exitcode=1;
-          ++count;
-        }
-      }
-      cpmClose(&dir);
-      if (count==0) /* try the pattern itself and find it does not work :) */ /*{{{*/
-      {
-        if (todir)
-        {
-          strcpy(dest,argv[argc-1]);
-          strcat(dest,"/");
-          strcat(dest,src+2);
-        }
-        else strcpy(dest,argv[argc-1]);
-        if (cpmToUnix(&root,src,dest)) exitcode=1;
+        char *translate;
+
+        strcpy(dest,last);
+        strcat(dest,"/");
+        translate=dest+strlen(dest);
+        strcat(dest,gargv[i]+2);
+        while ((translate=strchr(translate,'/'))) *translate=',';
       }
-      /*}}}*/
+      else strcpy(dest,last);
+      if (cpmToUnix(&root,gargv[i],dest)) exitcode=1;
     }
   }
   /*}}}*/
@@ -232,14 +216,14 @@ int main(int argc, char *argv[])
   {
     int i;
 
-    for (i=optind+1; i<(argc-1); ++i)
+    for (i=optind; i<(argc-1); ++i)
     {
       /* variables */ /*{{{*/
       char *dest=(char*)0;
       FILE *ufp;
       /*}}}*/
 
-      if ((ufp=fopen(argv[i],"r"))==(FILE*)0) /* cry a little */ /*{{{*/
+      if ((ufp=fopen(argv[i],"rb"))==(FILE*)0) /* cry a little */ /*{{{*/
       {
         fprintf(stderr,"%s: can not open %s: %s\n",cmd,argv[i],strerror(errno));
         exitcode=1;
@@ -248,17 +232,25 @@ int main(int argc, char *argv[])
       else
       {
         struct cpmInode ino;
-        char cpmname[2+8+3+1]; /* 00foobarxy.zzy\0 */
+        char cpmname[2+8+1+3+1]; /* 00foobarxy.zzy\0 */
+        char *translate;
+        struct stat st;
+
+        stat(argv[i],&st);
 
         if (todir)
         {
           if ((dest=strrchr(argv[i],'/'))!=(char*)0) ++dest; else dest=argv[i];
-          sprintf(cpmname,"%02d%s",userNumber(argv[argc-1]),dest);
+          snprintf(cpmname,sizeof(cpmname),"%02d%s",userNumber(argv[argc-1]),dest);
         }
         else
         {
-          sprintf(cpmname,"%02d%s",userNumber(argv[argc-1]),strchr(argv[argc-1],':')+1);
+          snprintf(cpmname,sizeof(cpmname),"%02d%s",userNumber(argv[argc-1]),strchr(argv[argc-1],':')+1);
         }
+
+        translate=cpmname;
+        while ((translate=strchr(translate,','))) *translate='/';
+
         if (cpmCreat(&root,cpmname,&ino,0666)==-1) /* just cry */ /*{{{*/
         {
           fprintf(stderr,"%s: can not create %s: %s\n",cmd,cpmname,boo);
@@ -274,9 +266,9 @@ int main(int argc, char *argv[])
           cpmOpen(&ino,&file,O_WRONLY);
           do
           {
-            int j;
+            ssize_t j;
 
-            for (j=0; j<(sizeof(buf)/2) && (c=getc(ufp))!=EOF; ++j)
+            for (j=0; j<((ssize_t)sizeof(buf)/2) && (c=getc(ufp))!=EOF; ++j)
             {
               if (text && c=='\n') buf[j++]='\r';
               buf[j]=c;
@@ -296,12 +288,27 @@ int main(int argc, char *argv[])
             exitcode=1;
           }
           /*}}}*/
+          if (preserve && !ohno)
+          {
+            struct utimbuf times;
+            times.actime=st.st_atime;
+            times.modtime=st.st_mtime;
+            cpmUtime(&ino,&times);
+          }
+        }
+        if (fclose(ufp)==EOF)
+        {
+          fprintf(stderr,"%s: can not close %s: %s\n",cmd,dest,strerror(errno));
+          exitcode=1;
         }
-        fclose(ufp);
       }
     }
   }
   /*}}}*/
-  cpmUmount(&super);
+  if (cpmUmount(&super)==-1)
+  {
+    fprintf(stderr,"%s: can not umount device: %s\n",cmd,boo);
+    exitcode=1;
+  }
   exit(exitcode);
 }