emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mktemp: make argument optional (coreutil 6.12 compat)

Browse Source 
function                                             old     new   delta
mktemp_main                                          157     174     +17
packed_usage                                       24508   24504      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 17/-4)              Total: 13 bytes
This commit is contained in:
Denis Vlasenko 2008-06-05 12:06:00 +00:00
parent 66d56c565e
commit c05b1684a0
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
debianutils/mktemp.c
View File

@ -9,34 +9,53 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/ */
/* Coreutils 6.12 man page says:
* mktemp [OPTION]... [TEMPLATE]
* Create a temporary file or directory, safely, and print its name. If
* TEMPLATE is not specified, use tmp.XXXXXXXXXX.
* -d, --directory
* create a directory, not a file
* -q, --quiet
* suppress diagnostics about file/dir-creation failure
* -u, --dry-run
* do not create anything; merely print a name (unsafe)
* --tmpdir[=DIR]
* interpret TEMPLATE relative to DIR. If DIR is not specified,
* use $TMPDIR if set, else /tmp. With this option, TEMPLATE must
* not be an absolute name. Unlike with -t, TEMPLATE may contain
* slashes, but even here, mktemp still creates only the final com-
* ponent.
* -p DIR use DIR as a prefix; implies -t [deprecated]
* -t interpret TEMPLATE as a single file name component, relative to
* a directory: $TMPDIR, if set; else the directory specified via
* -p; else /tmp [deprecated]
*/
#include "libbb.h" #include "libbb.h"
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 ATTRIBUTE_UNUSED, char **argv) int mktemp_main(int argc ATTRIBUTE_UNUSED, char **argv)
{ {
// -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; const char *path;
char *chp; char *chp;
unsigned flags; unsigned opt;
opt_complementary = "=1"; /* exactly one arg */ opt_complementary = "?1"; /* 1 argument max */
flags = getopt32(argv, "dqtp:", &path); opt = getopt32(argv, "dqtp:", &path);
chp = argv[optind]; chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXXXXXX");
if (flags & (4|8)) { /* -t and/or -p */ if (opt & (4|8)) { /* -t and/or -p */
const char *dir = getenv("TMPDIR"); const char *dir = getenv("TMPDIR");
if (dir && *dir != '\0') if (dir && *dir != '\0')
path = dir; path = dir;
else if (!(flags & 8)) /* No -p */ else if (!(opt & 8)) /* no -p */
path = "/tmp/"; path = "/tmp/";
/* else path comes from -p DIR */ /* else path comes from -p DIR */
chp = concat_path_file(path, chp); chp = concat_path_file(path, chp);
} }
if (flags & 1) { /* -d */ if (opt & 1) { /* -d */
if (mkdtemp(chp) == NULL) if (mkdtemp(chp) == NULL)
return EXIT_FAILURE; return EXIT_FAILURE;
} else { } else {

11
include/usage.h
View File

@ -2542,19 +2542,18 @@
#endif #endif
#define mktemp_trivial_usage \ #define mktemp_trivial_usage \
"[-dt] [-p DIR] TEMPLATE" "[-dt] [-p DIR] [TEMPLATE]"
#define mktemp_full_usage "\n\n" \ #define mktemp_full_usage "\n\n" \
"Create a temporary file with its name based on TEMPLATE.\n" \ "Create a temporary file with name based on TEMPLATE and print its name.\n" \
"TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX).\n" \ "TEMPLATE must end with XXXXXX (i.e., /tmp/temp.XXXXXX).\n" \
"\nOptions:" \ "\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" - we ignore it */ \ /* "\n -q Fail silently if an error occurs" - we ignore it */ \
"\n -t Generate a path rooted in temporary directory" \ "\n -t Generate a path rooted in temporary directory" \
"\n -p DIR Use DIR as a temporary directory (implies -t)" \ "\n -p DIR Use DIR as a temporary directory (implies -t)" \
"\n" \ "\n" \
"\n" \ "\nFor -t or -p, directory is chosen as follows:" \
"For -t or -p, directory is chosen as follows:\n" \ "\n$TMPDIR if set, else -p DIR, else /tmp" \
"$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" \