#include <glob.h>
#include <string.h>
#include <stdlib.h>
+#include <errno.h>
#include "uci.h"
#include "uci_internal.h"
len = end - str;
/* make sure that we have enough room in the buffer */
- while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
+ while (ofs + len + (int) sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
ctx->bufsz *= 2;
ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz);
}
{
struct uci_package *p = *package;
FILE *f1, *f2 = NULL;
- char *name = NULL;
- char *path = NULL;
+ char *volatile name = NULL;
+ char *volatile path = NULL;
char *filename = NULL;
- struct stat statbuf;
- bool do_rename = false;
+ volatile bool do_rename = false;
+ int fd;
if (!p->path) {
if (overwrite)
goto done;
}
- if (!mktemp(filename))
- *filename = 0;
+ fd = mkstemp(filename);
+ if (fd == -1)
+ UCI_THROW(ctx, UCI_ERR_IO);
- if (!*filename) {
- free(filename);
+ if ((flock(fd, LOCK_EX) < 0) && (errno != ENOSYS))
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ if (lseek(fd, 0, SEEK_SET) < 0)
UCI_THROW(ctx, UCI_ERR_IO);
- }
- if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
+ f2 = fdopen(fd, "w+");
+ if (!f2)
UCI_THROW(ctx, UCI_ERR_IO);
- f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
uci_export(ctx, f2, p, false);
fflush(f2);
{
char **configs;
glob_t globbuf;
- int size, i, j, skipped;
+ int size, j, skipped;
+ size_t i;
char *buf;
char *dir;
return configs;
}
-static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
+static struct uci_package *uci_file_load(struct uci_context *ctx,
+ const char *volatile name)
{
struct uci_package *package = NULL;
char *filename;
bool confdir;
- FILE *file = NULL;
+ FILE *volatile file = NULL;
switch (name[0]) {
case '.':