shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

man-generator: don't ignore description file errors

Browse Source 
In case we provide a description file it has to
succeed opening and reading.  Dynamically allocate
buffer space for it whilst on it.
This commit is contained in:
Heinz Mauelshagen 2017-03-30 19:51:35 +02:00
parent 980e4f673e
commit 0da040b1eb
1 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tools/command.c
View File

@ -3215,29 +3215,51 @@ static char *upper_command_name(char *str)
#define MAX_MAN_DESC (1024 * 1024)
static void include_description_file(char *name, char *des_file)
static int include_description_file(char *name, char *des_file)
{
char buf[MAX_MAN_DESC];
int fd;
char *buf;
int fd, r = 0;
ssize_t sz;
struct stat stat;
memset(buf, 0, sizeof(buf));
if ((fd = open(des_file, O_RDONLY)) < 0) {
log_error("Failed to open description file %s.", des_file);
return 0;
}
fd = open(des_file, O_RDONLY);
if (fstat(fd, &stat) < 0) {
log_error("Failed to stat description file %s.", des_file);
goto out_close;
}
if (fd < 0)
return;
if (stat.st_size > MAX_MAN_DESC) {
log_error("Description file %s is too large.", des_file);
goto out_close;
}
(void)read(fd, buf, sizeof(buf));
if (!(buf = dm_malloc(stat.st_size + 1))) {
log_error("Failed to allocate buffer for description file %s.", des_file);
goto out_close;
}
buf[MAX_MAN_DESC-1] = '\0';
if ((sz = read(fd, buf, stat.st_size)) < 0) {
log_error("Failed to read description file %s.", des_file);
goto out_free;
}
printf(".SH DESCRIPTION\n");
printf("%s", buf);
buf[sz] = '\0';
printf(".SH DESCRIPTION\n%s", buf);
r = 1;
out_free:
dm_free(buf);
out_close:
close(fd);
return r;
}
static void _print_man(char *name, char *des_file, int secondary)
static int _print_man(char *name, char *des_file, int secondary)
{
struct command_name *cname;
struct command *cmd, *prev_cmd = NULL;
@ -3291,7 +3313,7 @@ static void _print_man(char *name, char *des_file, int secondary)
prev_cmd = cmd;
if (!(cname = find_command_name(cmd->name)))
return;
return 0;
if (cname->variant_has_ro && cname->variant_has_rp)
printf("\\fB%s\\fP \\fIoption_args\\fP \\fIposition_args\\fP\n", lvmname);
@ -3320,9 +3342,8 @@ static void _print_man(char *name, char *des_file, int secondary)
_print_man_all_options_list(cname);
}
if (des_file) {
include_description_file(lvmname, des_file);
}
if (des_file && !include_description_file(lvmname, des_file))
return 0;
printf(".SH USAGE\n");
}
@ -3351,6 +3372,8 @@ static void _print_man(char *name, char *des_file, int secondary)
printf("\n");
continue;
}
return 1;
}
static void _print_man_secondary(char *name)
@ -3360,10 +3383,8 @@ static void _print_man_secondary(char *name)
int header = 0;
int i;
if (!strncmp(name, "lvm-", 4)) {
name[3] = ' ';
if (!strncmp(name, "lvm-", 4))
name += 4;
}
for (i = 0; i < COMMAND_COUNT; i++) {
@ -3403,8 +3424,7 @@ int main(int argc, char *argv[])
char *desfile = NULL;
int primary = 0;
int secondary = 0;
memset(&commands, 0, sizeof(commands));
int r = 1;
static struct option long_options[] = {
{"primary", no_argument, 0, 'p' },
@ -3412,6 +3432,8 @@ int main(int argc, char *argv[])
{0, 0, 0, 0 }
};
memset(&commands, 0, sizeof(commands));
while (1) {
int c;
int option_index = 0;
@ -3434,14 +3456,14 @@ int main(int argc, char *argv[])
if (!primary && !secondary) {
log_error("Usage: %s --primary|--secondary <command> [/path/to/description-file].", argv[0]);
exit(EXIT_FAILURE);
goto out;
}
if (optind < argc)
cmdname = strdup(argv[optind++]);
else {
log_error("Missing command name.");
exit(EXIT_FAILURE);
goto out;
}
if (optind < argc)
@ -3454,11 +3476,12 @@ int main(int argc, char *argv[])
factor_common_options();
if (primary)
_print_man(cmdname, desfile, secondary);
r = _print_man(cmdname, desfile, secondary);
else if (secondary)
_print_man_secondary(cmdname);
return 0;
out:
exit(r ? EXIT_SUCCESS: EXIT_FAILURE);
}
#endif