Skip to content

Add -h/--help support to ks and ramdump #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add -h/--help support to ks and ramdump #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions ks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ int qdl_write(struct qdl_device *qdl, const void *buf, size_t len)
return write(qdl->fd, buf, len);
}

static void print_usage(void)
static void print_usage(FILE *out)
{
extern const char *__progname;

fprintf(stderr,
fprintf(out,
"%s -p <sahara dev_node> -s <id:file path> ...\n",
__progname);
fprintf(stderr,
fprintf(out,
" -h --help Print this usage info\n"
" -p --port Sahara device node to use\n"
" -s <id:file path> --sahara <id:file path> Sahara protocol file mapping\n"
"\n"
Expand All @@ -62,13 +63,14 @@ int main(int argc, char **argv)

static struct option options[] = {
{"debug", no_argument, 0, 'd'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
{"port", required_argument, 0, 'p'},
{"sahara", required_argument, 0, 's'},
{0, 0, 0, 0}
};

while ((opt = getopt_long(argc, argv, "dvp:s:", options, NULL)) != -1) {
while ((opt = getopt_long(argc, argv, "dvp:s:h", options, NULL)) != -1) {
switch (opt) {
case 'd':
qdl_debug = true;
Expand All @@ -84,7 +86,7 @@ int main(int argc, char **argv)
found_mapping = true;
file_id = strtol(optarg, NULL, 10);
if (file_id < 0) {
print_usage();
print_usage(stderr);
return 1;
}
if (file_id >= MAPPING_SZ) {
Expand All @@ -96,21 +98,24 @@ int main(int argc, char **argv)
}
colon = strchr(optarg, ':');
if (!colon) {
print_usage();
print_usage(stderr);
return 1;
}
qdl.mappings[file_id] = &optarg[colon - optarg + 1];
printf("Created mapping ID:%ld File:%s\n", file_id, qdl.mappings[file_id]);
break;
case 'h':
print_usage(stdout);
return 0;
default:
print_usage();
print_usage(stderr);
return 1;
}
}

// -p and -s is required
if (!dev_node || !found_mapping) {
print_usage();
print_usage(stderr);
return 1;
}

Expand Down
20 changes: 13 additions & 7 deletions ramdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ const char *__progname = "ramdump";

bool qdl_debug;

static void print_usage(void)
static void print_usage(FILE *out)
{
extern const char *__progname;

fprintf(stderr,
fprintf(out,
"%s [--debug] [-o <ramdump-path>] [segment-filter,...]\n",
__progname);
exit(1);
}

int main(int argc, char **argv)
Expand All @@ -41,10 +40,11 @@ int main(int argc, char **argv)
{"version", no_argument, 0, 'v'},
{"output", required_argument, 0, 'o'},
{"serial", required_argument, 0, 'S'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};

while ((opt = getopt_long(argc, argv, "dvo:S:", options, NULL)) != -1) {
while ((opt = getopt_long(argc, argv, "dvo:S:h", options, NULL)) != -1) {
switch (opt) {
case 'd':
qdl_debug = true;
Expand All @@ -59,16 +59,22 @@ int main(int argc, char **argv)
case 'S':
serial = optarg;
break;
case 'h':
print_usage(stdout);
return 0;
default:
print_usage();
print_usage(stderr);
return 1;
}
}

if (optind < argc)
filter = argv[optind++];

if (optind != argc)
print_usage();
if (optind != argc) {
print_usage(stderr);
return 1;
}

if (qdl_debug)
print_version();
Expand Down