From fe3d70d05486af0dfd857c9c949f1bedde08ed3d Mon Sep 17 00:00:00 2001 From: rwatson Date: Thu, 31 Mar 2005 04:05:17 +0000 Subject: Don't default to '/var/tmp/ffsinfo' for the output of ffsinfo(8), since /var/tmp is a world-writable directory. MFC after: 3 days Reported by: Jon Passki --- sbin/ffsinfo/ffsinfo.8 | 9 +++++---- sbin/ffsinfo/ffsinfo.c | 7 +++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sbin') diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8 index 99636ea0..fcdd8a2 100644 --- a/sbin/ffsinfo/ffsinfo.8 +++ b/sbin/ffsinfo/ffsinfo.8 @@ -106,18 +106,19 @@ inode information indirect block dump .El .It Fl o Ar outfile -This allows to change the output filename where the dump is written to. -The current default is -.Pa /var/tmp/ffsinfo . +This allows to set the output filename where the dump is written to, and +must be specified. If .Fl is provided, output will be sent to stdout. .El .Sh EXAMPLES -.Dl ffsinfo -l 1023 /dev/vinum/testvol +.Dl ffsinfo -o /var/tmp/ffsinfo -l 1023 /dev/vinum/testvol .Pp will dump .Pa /dev/vinum/testvol +to +.Pa /var/tmp/ffsinfo with all available information. .Sh SEE ALSO .Xr disklabel 8 , diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c index 6ee4c8d..8df4b41 100644 --- a/sbin/ffsinfo/ffsinfo.c +++ b/sbin/ffsinfo/ffsinfo.c @@ -141,10 +141,7 @@ main(int argc, char **argv) cfg_lv=0xff; cfg_in=-2; cfg_cg=-2; - out_file=strdup("/var/tmp/ffsinfo"); - if(out_file == NULL) { - errx(1, "strdup failed"); - } + out_file=NULL; while ((ch=getopt(argc, argv, "g:i:l:o:")) != -1) { switch(ch) { @@ -192,6 +189,8 @@ main(int argc, char **argv) usage(); } device=*argv; + if (out_file == NULL) + errx(1, "out_file not specified"); /* * Now we try to guess the (raw)device name. -- cgit v1.1