Skip to content

Commit

Permalink
Add mkstemp() for mingw build
Browse files Browse the repository at this point in the history
  • Loading branch information
nicowilliams committed Jan 1, 2015
1 parent 426913f commit 157c95b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -86,6 +86,7 @@ if test "x$valgrind_cmd" = "x" ; then
AC_MSG_WARN([valgrind is required to test jq.])
fi
AC_CHECK_FUNCS(memmem)
AC_CHECK_FUNCS(mkstemp)


dnl Don't attempt to build docs if there's no Ruby lying around
Expand Down
27 changes: 26 additions & 1 deletion util.c
@@ -1,9 +1,13 @@

#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
#include <fcntl.h>

#ifdef HAVE_MEMMEM
#define _GNU_SOURCE
#include <string.h>
#endif
#include <assert.h>
#ifndef WIN32
#include <pwd.h>
#endif
Expand All @@ -15,6 +19,27 @@
#include "util.h"
#include "jv.h"

#ifndef HAVE_MKSTEMP
int mkstemp(char *template) {
size_t len = strlen(template);
int tries=5;
int fd;

// mktemp() truncates template when it fails
char *s = alloca(len + 1);
assert(s != NULL);
strcpy(s, template);

do {
// Restore template
strcpy(template, s);
(void) mktemp(template);
fd = open(template, O_CREAT | O_EXCL | O_RDWR, 0600);
} while (fd == -1 && tries-- > 0);
return fd;
}
#endif

jv expand_path(jv path) {
assert(jv_get_kind(path) == JV_KIND_STRING);
const char *pstr = jv_string_value(path);
Expand Down
4 changes: 4 additions & 0 deletions util.h
Expand Up @@ -3,6 +3,10 @@

#include "jv.h"

#ifndef HAVE_MKSTEMP
int mkstemp(char *template);
#endif

jv expand_path(jv);
jv get_home(void);
jv jq_realpath(jv);
Expand Down

0 comments on commit 157c95b

Please sign in to comment.