projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doxyfileのバージョンアップ
[YACASL2.git]
/
src
/
dumpword.c
diff --git
a/src/dumpword.c
b/src/dumpword.c
index
5ce0ec4
..
88915a8
100644
(file)
--- a/
src/dumpword.c
+++ b/
src/dumpword.c
@@
-1,47
+1,77
@@
-#include "casl2.h"
-#define _GNU_SOURCE
-#include <getopt.h>
+#include "package.h"
+#include "word.h"
+/**
+ * @brief dumpwordコマンドのオプション
+ */
static struct option longopts[] = {
{ "arithmetic", no_argument, NULL, 'a' },
{ "logical", no_argument, NULL, 'l' },
static struct option longopts[] = {
{ "arithmetic", no_argument, NULL, 'a' },
{ "logical", no_argument, NULL, 'l' },
+ { "version", no_argument, NULL, 'v' },
{ "help", no_argument, NULL, 'h' },
{ 0, 0, 0, 0 },
};
{ "help", no_argument, NULL, 'h' },
{ 0, 0, 0, 0 },
};
+/**
+ * @brief dumpwordコマンドのメイン
+ *
+ * @return 正常終了時は0、エラー発生時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
+ */
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- bool logicalmode = false; /* レジストリの内容を論理値(0〜65535)で表示する場合はtrue */
- int opt;
- WORD word;
+ bool logicalmode = false; /* レジストリの内容を論理値(0から65535)で表示する場合はtrue */
+ int opt = 0;
+ int stat = 0;
+ WORD word = 0;
+ const char *version = PACKAGE_VERSION;
+ const char *cmdversion = "dumpword of YACASL2 version %s\n";
const char *usage = "Usage: %s [-alh] WORD\n";
const char *usage = "Usage: %s [-alh] WORD\n";
- cerr = malloc_chk(sizeof(CERR), "cerr");
- while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
+ /* エラーの定義 */
+ cerr_init();
+ addcerrlist_load();
+ addcerrlist_word();
+
+ /* オプションの処理 */
+ while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
switch(opt) {
case 'l':
logicalmode = true;
break;
switch(opt) {
case 'l':
logicalmode = true;
break;
+ case 'v':
+ fprintf(stdout, cmdversion, version);
+ goto dumpwordfin;
case 'h':
fprintf(stdout, usage, argv[0]);
case 'h':
fprintf(stdout, usage, argv[0]);
-
return 0
;
+
goto dumpwordfin
;
case '?':
fprintf(stderr, usage, argv[0]);
case '?':
fprintf(stderr, usage, argv[0]);
- exit(-1);
+ setcerr(999, "");
+ goto dumpwordfin;
}
}
if(argv[optind] == NULL) {
fprintf(stderr, usage, argv[0]);
}
}
if(argv[optind] == NULL) {
fprintf(stderr, usage, argv[0]);
- exit(-1);
+ setcerr(999, "");
+ goto dumpwordfin;
}
/* WORD値に変換 */
word = nh2word(argv[optind]);
if(cerr->num > 0) {
fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
}
/* WORD値に変換 */
word = nh2word(argv[optind]);
if(cerr->num > 0) {
fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
-
exit(-1)
;
+
goto dumpwordfin
;
}
fprintf(stdout, "%6s: ", argv[optind]);
print_dumpword(word, logicalmode);
}
fprintf(stdout, "%6s: ", argv[optind]);
print_dumpword(word, logicalmode);
- return 0;
+ fprintf(stdout, "\n");
+dumpwordfin:
+ if(cerr->num > 0) {
+ stat = 1;
+ }
+ freecerr(); /* エラーの解放 */
+ return stat;
}
}