summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibC
diff options
context:
space:
mode:
authorEWouters <6179932+EWouters@users.noreply.github.com>2022-09-03 19:35:47 +0200
committerSam Atkins <atkinssj@gmail.com>2022-10-06 16:14:40 +0100
commit7c93eabffe90ff035818bf4b1a54325648d6f21c (patch)
tree05cab72d87f133e5ca52028a7b8fbfb0e212d826 /Userland/Libraries/LibC
parent678d385a3f0ab0bfcf38a77566ca1f75adccda53 (diff)
downloadserenity-7c93eabffe90ff035818bf4b1a54325648d6f21c.zip
LibC: Implement `mkstemps()` in stdlib and add a test
`mkstemps` generates a unique temporary file name from a pattern like `prefixXXXXXXsuffix` where `prefix` and `suffix` can be any string with only characters that are valid in a filename. The second parameter is the length of the suffix. `mkstemp` is `mkstemps` with suffix length 0, so to avoid code duplication it calls `mkstemps`. It is unlikely this has any significant performance impact on SerenityOS. `generate_unique_filename` now takes the suffix length as a `size_t`. The original behavior of this function is preserved when specifying a suffix length of 0. All original uses of this function have been adapted. `mkstemps()` was added because it is required by version 4.6.3 of the ccache port.
Diffstat (limited to 'Userland/Libraries/LibC')
-rw-r--r--Userland/Libraries/LibC/stdlib.cpp19
-rw-r--r--Userland/Libraries/LibC/stdlib.h1
2 files changed, 14 insertions, 6 deletions
diff --git a/Userland/Libraries/LibC/stdlib.cpp b/Userland/Libraries/LibC/stdlib.cpp
index 39069a93e0..8a56fc9313 100644
--- a/Userland/Libraries/LibC/stdlib.cpp
+++ b/Userland/Libraries/LibC/stdlib.cpp
@@ -161,14 +161,14 @@ static bool is_either(char* str, int offset, char lower, char upper)
}
template<typename Callback>
-inline int generate_unique_filename(char* pattern, Callback callback)
+inline int generate_unique_filename(char* pattern, size_t suffix_length, Callback callback)
{
size_t length = strlen(pattern);
- if (length < 6 || memcmp(pattern + length - 6, "XXXXXX", 6))
+ if (length < 6 + suffix_length || memcmp(pattern + length - 6 - suffix_length, "XXXXXX", 6))
return EINVAL;
- size_t start = length - 6;
+ size_t start = length - 6 - suffix_length;
constexpr char random_characters[] = "abcdefghijklmnopqrstuvwxyz0123456789";
@@ -828,7 +828,7 @@ int system(char const* command)
// https://pubs.opengroup.org/onlinepubs/9699919799/functions/mktemp.html
char* mktemp(char* pattern)
{
- auto error = generate_unique_filename(pattern, [&] {
+ auto error = generate_unique_filename(pattern, 0, [&] {
struct stat st;
int rc = lstat(pattern, &st);
if (rc < 0 && errno == ENOENT)
@@ -845,8 +845,15 @@ char* mktemp(char* pattern)
// https://pubs.opengroup.org/onlinepubs/9699919799/functions/mkstemp.html
int mkstemp(char* pattern)
{
+ return mkstemps(pattern, 0);
+}
+
+// https://man7.org/linux/man-pages/man3/mkstemps.3.html
+int mkstemps(char* pattern, int suffix_length)
+{
+ VERIFY(suffix_length >= 0);
int fd = -1;
- auto error = generate_unique_filename(pattern, [&] {
+ auto error = generate_unique_filename(pattern, static_cast<size_t>(suffix_length), [&] {
fd = open(pattern, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); // I'm using the flags I saw glibc using.
if (fd >= 0)
return IterationDecision::Break;
@@ -862,7 +869,7 @@ int mkstemp(char* pattern)
// https://pubs.opengroup.org/onlinepubs/9699919799/functions/mkdtemp.html
char* mkdtemp(char* pattern)
{
- auto error = generate_unique_filename(pattern, [&] {
+ auto error = generate_unique_filename(pattern, 0, [&] {
if (mkdir(pattern, 0700) == 0)
return IterationDecision::Break;
return IterationDecision::Continue;
diff --git a/Userland/Libraries/LibC/stdlib.h b/Userland/Libraries/LibC/stdlib.h
index 9166205b40..d1d96daffb 100644
--- a/Userland/Libraries/LibC/stdlib.h
+++ b/Userland/Libraries/LibC/stdlib.h
@@ -58,6 +58,7 @@ double atof(char const*);
int system(char const* command);
char* mktemp(char*);
int mkstemp(char*);
+int mkstemps(char*, int);
char* mkdtemp(char*);
void* bsearch(void const* key, void const* base, size_t nmemb, size_t size, int (*compar)(void const*, void const*));
int mblen(char const*, size_t);