FreeCalypso > hg > freecalypso-tools
diff rvinterf/tmsh/ffs2.c @ 69:2159f260ed13
fc-tmsh: all commands internally return values
in preparation for adding one-shot mode of operation
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Wed, 26 Oct 2016 23:17:03 +0000 |
parents | e7502631a0f9 |
children |
line wrap: on
line diff
--- a/rvinterf/tmsh/ffs2.c Wed Oct 26 22:56:29 2016 +0000 +++ b/rvinterf/tmsh/ffs2.c Wed Oct 26 23:17:03 2016 +0000 @@ -12,8 +12,8 @@ #include "etm.h" #include "ffs.h" #include "tmffs2.h" +#include "exitcodes.h" -void cmd_ffs2_close(argc, argv) char **argv; { @@ -23,9 +23,9 @@ cmdpkt[2] = TMFFS_CLOSE; cmdpkt[3] = strtoul(argv[1], 0, 0); send_etm_cmd(cmdpkt, 3); + return(0); } -void cmd_ffs2_delete(argc, argv) char **argv; { @@ -35,7 +35,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -44,9 +44,9 @@ strcpy(dp, argv[1]); dp += slen + 1; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_format(argc, argv) char **argv; { @@ -56,7 +56,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: argument exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -68,9 +68,9 @@ *dp++ = 0xAD; *dp++ = 0x2B; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_mkdir(argc, argv) char **argv; { @@ -80,7 +80,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -89,9 +89,9 @@ strcpy(dp, argv[1]); dp += slen + 1; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_open(argc, argv) char **argv; { @@ -101,7 +101,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -111,9 +111,9 @@ dp += slen + 1; *dp++ = strtoul(argv[2], 0, 16); send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_opendir(argc, argv) char **argv; { @@ -123,7 +123,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -132,9 +132,9 @@ strcpy(dp, argv[1]); dp += slen + 1; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_preformat() { u_char cmdpkt[6]; @@ -145,9 +145,9 @@ cmdpkt[3] = 0xAD; cmdpkt[4] = 0xDE; send_etm_cmd(cmdpkt, 4); + return(0); } -void cmd_ffs2_query(argc, argv) char **argv; { @@ -157,9 +157,9 @@ cmdpkt[2] = TMFFS_QUERY; cmdpkt[3] = strtoul(argv[1], 0, 0); send_etm_cmd(cmdpkt, 3); + return(0); } -void cmd_ffs2_readfd(argc, argv) char **argv; { @@ -170,9 +170,9 @@ cmdpkt[3] = strtoul(argv[1], 0, 0); cmdpkt[4] = strtoul(argv[2], 0, 0); send_etm_cmd(cmdpkt, 4); + return(0); } -void cmd_ffs2_readfile(argc, argv) char **argv; { @@ -182,7 +182,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -192,9 +192,9 @@ dp += slen + 1; *dp++ = strtoul(argv[2], 0, 0); send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_stat(argc, argv) char **argv; { @@ -204,7 +204,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -213,9 +213,9 @@ strcpy(dp, argv[1]); dp += slen + 1; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_version() { u_char cmdpkt[4]; @@ -223,9 +223,9 @@ cmdpkt[1] = ETM_FFS2; cmdpkt[2] = TMFFS_VERSION; send_etm_cmd(cmdpkt, 2); + return(0); } -void cmd_ffs2_wrfile(argc, argv) char **argv; { @@ -235,12 +235,12 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } slen2 = strlen(argv[2]); if (slen2 > 64) { printf("error: write test data argument is too long\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -253,9 +253,9 @@ dp += slen2; *dp++ = FFS_O_CREATE | FFS_O_TRUNC; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_writefd(argc, argv) char **argv; { @@ -265,7 +265,7 @@ slen2 = strlen(argv[2]); if (slen2 > 64) { printf("error: write test data argument is too long\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -275,9 +275,9 @@ strcpy(dp, argv[2]); dp += slen2; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } -void cmd_ffs2_xlstat(argc, argv) char **argv; { @@ -287,7 +287,7 @@ slen = strlen(argv[1]); if (slen >= TMFFS_STRING_SIZE) { printf("error: pathname arg exceeds string length limit\n"); - return; + return(ERROR_USAGE); } dp = cmdpkt + 1; *dp++ = ETM_FFS2; @@ -296,13 +296,14 @@ strcpy(dp, argv[1]); dp += slen + 1; send_etm_cmd(cmdpkt, dp - cmdpkt - 1); + return(0); } static struct cmdtab { char *cmd; int minargs; int maxargs; - void (*func)(); + int (*func)(); } ffs2_cmds[] = { {"close", 1, 1, cmd_ffs2_close}, {"delete", 1, 1, cmd_ffs2_delete}, @@ -322,7 +323,6 @@ {0, 0, 0, 0} }; -void cmd_ffs2(argc, argv) char **argv; { @@ -334,16 +334,16 @@ break; if (!tp->func) { printf("error: no such ffs2 command\n"); - return; + return(ERROR_USAGE); } extargs = argc - 2; if (extargs > tp->maxargs) { printf("error: too many arguments\n"); - return; + return(ERROR_USAGE); } if (extargs < tp->minargs) { printf("error: too few arguments\n"); - return; + return(ERROR_USAGE); } - tp->func(argc - 1, argv + 1); + return tp->func(argc - 1, argv + 1); }