[BACK]Return to cmds.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / sectok

Diff for /src/usr.bin/sectok/Attic/cmds.c between version 1.14 and 1.15

version 1.14, 2001/07/27 14:13:08 version 1.15, 2001/08/02 17:09:18
Line 35 
Line 35 
 such damages.  such damages.
 */  */
   
   #ifdef __palmos__
   #pragma pack(2)
   #include <Common.h>
   #include <System/SysAll.h>
   #include <UI/UIAll.h>
   #include <System/Unix/sys_types.h>
   #include <System/Unix/unix_stdio.h>
   #include <System/Unix/unix_stdlib.h>
   #include <System/Unix/unix_string.h>
   #include <string.h>
   #include "getopt.h"
   #include "sectok.h"
   #include "field.h"
   #else
 #include <unistd.h>  #include <unistd.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <stdio.h>  #include <stdio.h>
 #include <signal.h>  #include <signal.h>
 #include <string.h>  #include <string.h>
 #include <sectok.h>  #include <sectok.h>
   #endif
   
 #include "sc.h"  #include "sc.h"
   
   #define MAXFILELEN 0xffff
 #define CARDIOSIZE 200  #define CARDIOSIZE 200
   
 struct {  struct dispatchtable dispatch_table[] = {
     char *cmd, *help;  
     int (*action) (int ac, char *av[]);  
 } dispatch_table[] = {  
     /* Non-card commands */      /* Non-card commands */
     { "help", "[command]", help },      { "help", "[command]", help },
     { "?", "[command]", help },      { "?", "[command]", help },
Line 64 
Line 77 
     { "isearch", "", isearch },      { "isearch", "", isearch },
     { "class", "[ class ]", class },      { "class", "[ class ]", class },
     { "read", "[ -x ] filesize", dread },      { "read", "[ -x ] filesize", dread },
   #ifndef __palmos__
     { "write", "input-filename", dwrite },      { "write", "input-filename", dwrite },
   #endif
   
     /* Cyberflex commands */      /* Cyberflex commands */
     { "ls", "[ -l ]", ls },      { "ls", "[ -l ]", ls },
Line 75 
Line 90 
     { "jatr", "", jatr },      { "jatr", "", jatr },
     { "jdata", "", jdata },      { "jdata", "", jdata },
     { "login", "[ -d ] [ -k keyno ] [ -v ] [ -x hex-aut0 ]", jlogin },      { "login", "[ -d ] [ -k keyno ] [ -v ] [ -x hex-aut0 ]", jlogin },
   #ifndef __palmos__
     { "jaut", "", jaut },      { "jaut", "", jaut },
     { "jload", "[ -p progID ] [ -c contID ] [ -s cont_size ] [ -i inst_size ] [ -a aid ] [ -v ] filename", jload },      { "jload", "[ -p progID ] [ -c contID ] [ -s cont_size ] [ -i inst_size ] [ -a aid ] [ -v ] filename", jload },
   #endif
     { "junload", "[ -p progID ] [ -c contID ]", junload },      { "junload", "[ -p progID ] [ -c contID ]", junload },
   #ifndef __palmos__
     { "setpass", "[ -d ] [ -x hex-aut0 ]", jsetpass },      { "setpass", "[ -d ] [ -x hex-aut0 ]", jsetpass },
   #endif
     { NULL, NULL, NULL }      { NULL, NULL, NULL }
 };  };
   
Line 185 
Line 204 
   
 int quit(int ac, char *av[])  int quit(int ac, char *av[])
 {  {
   #ifndef __palmos__
     exit(0);      exit(0);
   #else
       return -1;
   #endif
 }  }
   
 int apdu(int ac, char *av[])  int apdu(int ac, char *av[])
Line 321 
Line 344 
   
 int dread(int ac, char *av[])  int dread(int ac, char *av[])
 {  {
     int i, n, col = 0, p3, fsize, xflag = 0, sw;      int i, n, col = 0, fsize, xflag = 0, sw;
     unsigned char buf[CARDIOSIZE];      unsigned int p3;
       unsigned char buf[CARDIOSIZE+1];
   
     optind = optreset = 1;      optind = optreset = 1;
   
Line 344 
Line 368 
     if (fd < 0 && reset(0, NULL) < 0)      if (fd < 0 && reset(0, NULL) < 0)
         return -1;          return -1;
   
     for (p3 = 0; fsize && p3 < 100000; p3 += n) {      for (p3 = 0; fsize && p3 < MAXFILELEN; p3 += n) {
         n = (fsize < CARDIOSIZE) ? fsize : CARDIOSIZE;          n = (fsize < CARDIOSIZE) ? fsize : CARDIOSIZE;
         n = sectok_apdu(fd, cla, 0xb0, p3 >> 8, p3 & 0xff, 0, NULL, n, buf, &sw);          n = sectok_apdu(fd, cla, 0xb0, p3 >> 8, p3 & 0xff, 0, NULL, n, buf, &sw);
         if (!sectok_swOK(sw)) {          if (!sectok_swOK(sw)) {
Line 357 
Line 381 
                 if (col++ % 16 == 15)                  if (col++ % 16 == 15)
                     printf("\n");                      printf("\n");
             }              }
         } else          } else {
   #ifdef __palmos__
               buf[n] = '\0';
               printf("%s", buf);
   #else
             fwrite(buf, 1, n, stdout);              fwrite(buf, 1, n, stdout);
   #endif
           }
         fsize -= n;          fsize -= n;
     }      }
   
Line 368 
Line 398 
     return 0;      return 0;
 }  }
   
   #ifndef __palmos__
 int dwrite(int ac, char *av[])  int dwrite(int ac, char *av[])
 {  {
     int n, p3, sw;      int n, p3, sw;
Line 401 
Line 432 
   
     return (n ? 0 : -1);      return (n ? 0 : -1);
 }  }
   #endif
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15