BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mktemp: support -p DIR (Timo Teras <timo.teras at iki.fi>) 

packed_usage                                       23595   23660     +65
mktemp_main                                          139     157     +18
1_10_stable
Denis Vlasenko 2008-02-09 06:26:53 +00:00
parent 1e2a7e4ed1
commit 65581f3ed1
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debianutils/mktemp.c
View File

@ -14,23 +14,29 @@
int mktemp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mktemp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mktemp_main(int argc, char **argv) int mktemp_main(int argc, char **argv)
{ {
unsigned long flags = getopt32(argv, "dqt"); // -d Make a directory instead of a file
// -q Fail silently if an error occurs [bbox: ignored]
// -t Generate a path rooted in temporary directory
// -p DIR Use DIR as a temporary directory (implies -t)
const char *path;
char *chp; char *chp;
unsigned flags;
if (optind + 1 != argc) opt_complementary = "=1"; /* exactly one arg */
bb_show_usage(); flags = getopt32(argv, "dqtp:", &path);
chp = argv[optind]; chp = argv[optind];
if (flags & 4) { if (flags & (4|8)) { /* -t and/or -p */
char *dir = getenv("TMPDIR"); const char *dir = getenv("TMPDIR");
if (dir && *dir != '\0') if (dir && *dir != '\0')
chp = concat_path_file(dir, chp); path = dir;
else else if (!(flags & 8)) /* No -p */
chp = concat_path_file("/tmp/", chp); path = "/tmp/";
/* else path comes from -p DIR */
chp = concat_path_file(path, chp);
} }
if (flags & 1) { if (flags & 1) { /* -d */
if (mkdtemp(chp) == NULL) if (mkdtemp(chp) == NULL)
return EXIT_FAILURE; return EXIT_FAILURE;
} else { } else {

10
include/usage.h
View File

@ -2339,13 +2339,19 @@ USE_FEATURE_BRCTL_FANCY("\n" \
" block-count Number of block to use (default is entire partition)" " block-count Number of block to use (default is entire partition)"
#define mktemp_trivial_usage \ #define mktemp_trivial_usage \
"[-dq] TEMPLATE" "[-dqt] [-p dir] TEMPLATE"
#define mktemp_full_usage \ #define mktemp_full_usage \
"Create a temporary file with its name based on TEMPLATE.\n" \ "Create a temporary file with its name based on TEMPLATE.\n" \
"TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX)." \ "TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX)." \
"\n\nOptions:\n" \ "\n\nOptions:\n" \
" -d Make a directory instead of a file\n" \ " -d Make a directory instead of a file\n" \
" -q Fail silently if an error occurs" /* " -q Fail silently if an error occurs\n" - we ignore it */ \
" -t Generate a path rooted in temporary directory\n" \
" -p DIR Use DIR as a temporary directory (implies -t)\n" \
"\n" \
"For -t or -p, directory is chosen as follows:\n" \
"$TMPDIR if set, else -p DIR, else /tmp"
#define mktemp_example_usage \ #define mktemp_example_usage \
"$ mktemp /tmp/temp.XXXXXX\n" \ "$ mktemp /tmp/temp.XXXXXX\n" \
"/tmp/temp.mWiLjM\n" \ "/tmp/temp.mWiLjM\n" \