Applied, thanks. See notes below.
On Mon, Apr 27, 2015 at 05:20:55PM +0200, Stanislav Brabec wrote:
> Note: Code in if and else is intentionally partially duplicated. Current
> human readable output of floats does not conform to locale conventions,
> and may be changed in future. But we want to keep machine readable output
> exactly same as it is now.
The question is if we can change the human readable output. It was
requested by Google and I guess they parse the output.
> +static int report_stats_fd;
> +static FILE *report_stats_file;
It seems that report_stats_fd does not have to be global variable,
code depends on report_stats_file. Fixed.
> case 'r':
> report_stats = 1;
> + if (arg[j+1]) { /* -r<fd> */
> + report_stats_fd = string_to_int(arg+j+1);
> + if (report_stats_fd < 0)
> + report_stats_fd = 0;
> + else
> + goto next_arg;
> + } else if (i+1 < argc && *argv[i+1] != '-') { /* -r <fd> */
> + report_stats_fd = string_to_int(argv[i+1]);
> + if (report_stats_fd < 0)
> + report_stats_fd = 0;
> + else {
> + ++i;
> + goto next_arg;
> + }
> + }
> break;
...you have copied code from -C, right?
The -C code interprets errors or missing fd as 0, it's probably
because fsck.extN requires file descriptor for -C, but fsck(8) has the
fd as optional argument.
I don't think we need this behavior for -r too. It would be better to
report all possible mistakes. Fixed.
> + /* Validate the report stats file descriptor to avoid disasters */
> + if (report_stats_fd) {
> + report_stats_file = fdopen(report_stats_fd, "w");
> + if (!report_stats_file)
> + err(FSCK_EX_ERROR,
> + _("invalid argument -r %d"),
> + report_stats_fd);
> + }
> +
It means that "-r 0" is unsupported, why? I have fixed this.
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
