projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make cmetricsを、BSD sedでも正常に出力するように修正
[YACASL2.git]
/
src
/
dumpword.c
diff --git
a/src/dumpword.c
b/src/dumpword.c
index
5ce0ec4
..
0c75337
100644
(file)
--- a/
src/dumpword.c
+++ b/
src/dumpword.c
@@
-1,45
+1,66
@@
-#include "casl2.h"
#define _GNU_SOURCE
#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
#include <getopt.h>
#include <getopt.h>
+#include "word.h"
+#include "cerr.h"
+#include "package.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; /* ã
\83
‹
\82
¸ã
\82
¹ã
\83
\88
ã
\83
ªã
\81
®å
\86
\85
容ã
\82
\92
è«
\96
ç
\90
\86
å
\80
¤ï¼
\88
0ã
\80
\9c
65535)で表示する場合はtrue */
+ bool logicalmode = false; /* ã
\83
‹
\82
¸ã
\82
¹ã
\83
\88
ã
\83
ªã
\81
®å
\86
\85
容ã
\82
\92
è«
\96
ç
\90
\86
å
\80
¤ï¼
\88
0ã
\81
\8b
ã
\82
\89
65535)で表示する場合はtrue */
int opt;
WORD word;
int opt;
WORD word;
+ const char *version = PACKAGE_VERSION, *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_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);
+ return 0;
case 'h':
fprintf(stdout, usage, argv[0]);
return 0;
case '?':
fprintf(stderr, usage, argv[0]);
case 'h':
fprintf(stdout, usage, argv[0]);
return 0;
case '?':
fprintf(stderr, usage, argv[0]);
- exit(
-
1);
+ exit(1);
}
}
if(argv[optind] == NULL) {
fprintf(stderr, usage, argv[0]);
}
}
if(argv[optind] == NULL) {
fprintf(stderr, usage, argv[0]);
- exit(
-
1);
+ exit(1);
}
/* 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);
+ exit(1);
}
fprintf(stdout, "%6s: ", argv[optind]);
print_dumpword(word, logicalmode);
}
fprintf(stdout, "%6s: ", argv[optind]);
print_dumpword(word, logicalmode);