Merge tag 'debian/1.8.5p2-1' into squeeze

[debian/sudo] / common / fileops.c

diff --git a/common/fileops.c b/common/fileops.c
new file mode 100644 (file)
index 0000000..f99710c
--- /dev/null
+++ b/common/fileops.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 1999-2005, 2007, 2009-2011
+ *     Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#ifdef HAVE_FLOCK
+# include <sys/file.h>
+#endif /* HAVE_FLOCK */
+#include <stdio.h>
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# include "compat/stdbool.h"
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif /* HAVE_STRING_H */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif /* HAVE_STRINGS_H */
+#include <ctype.h>
+#include <limits.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#include <fcntl.h>
+#if TIME_WITH_SYS_TIME
+# include <time.h>
+#endif
+#ifndef HAVE_STRUCT_TIMESPEC
+# include "compat/timespec.h"
+#endif
+
+#include "missing.h"
+#include "fileops.h"
+#include "sudo_debug.h"
+
+#ifndef LINE_MAX
+# define LINE_MAX 2048
+#endif
+
+/*
+ * Update the access and modify times on an fd or file.
+ */
+int
+touch(int fd, char *path, struct timeval *tvp)
+{
+    struct timeval times[2];
+    int rval = -1;
+    debug_decl(touch, SUDO_DEBUG_UTIL)
+
+    if (tvp != NULL) {
+       times[0].tv_sec = times[1].tv_sec = tvp->tv_sec;
+       times[0].tv_usec = times[1].tv_usec = tvp->tv_usec;
+    }
+
+#if defined(HAVE_FUTIME) || defined(HAVE_FUTIMES)
+    if (fd != -1)
+       rval = futimes(fd, tvp ? times : NULL);
+    else
+#endif
+    if (path != NULL)
+       rval = utimes(path, tvp ? times : NULL);
+    debug_return_int(rval);
+}
+
+/*
+ * Lock/unlock a file.
+ */
+#ifdef HAVE_LOCKF
+bool
+lock_file(int fd, int lockit)
+{
+    int op = 0;
+    debug_decl(lock_file, SUDO_DEBUG_UTIL)
+
+    switch (lockit) {
+       case SUDO_LOCK:
+           op = F_LOCK;
+           break;
+       case SUDO_TLOCK:
+           op = F_TLOCK;
+           break;
+       case SUDO_UNLOCK:
+           op = F_ULOCK;
+           break;
+    }
+    debug_return_bool(lockf(fd, op, 0) == 0);
+}
+#elif HAVE_FLOCK
+bool
+lock_file(int fd, int lockit)
+{
+    int op = 0;
+    debug_decl(lock_file, SUDO_DEBUG_UTIL)
+
+    switch (lockit) {
+       case SUDO_LOCK:
+           op = LOCK_EX;
+           break;
+       case SUDO_TLOCK:
+           op = LOCK_EX | LOCK_NB;
+           break;
+       case SUDO_UNLOCK:
+           op = LOCK_UN;
+           break;
+    }
+    debug_return_bool(flock(fd, op) == 0);
+}
+#else
+bool
+lock_file(int fd, int lockit)
+{
+#ifdef F_SETLK
+    int func;
+    struct flock lock;
+    debug_decl(lock_file, SUDO_DEBUG_UTIL)
+
+    lock.l_start = 0;
+    lock.l_len = 0;
+    lock.l_pid = getpid();
+    lock.l_type = (lockit == SUDO_UNLOCK) ? F_UNLCK : F_WRLCK;
+    lock.l_whence = SEEK_SET;
+    func = (lockit == SUDO_LOCK) ? F_SETLKW : F_SETLK;
+
+    debug_return_bool(fcntl(fd, func, &lock) == 0);
+#else
+    return true;
+#endif
+}
+#endif
+
+/*
+ * Read a line of input, remove comments and strip off leading
+ * and trailing spaces.  Returns static storage that is reused.
+ */
+char *
+sudo_parseln(FILE *fp)
+{
+    size_t len;
+    char *cp = NULL;
+    static char buf[LINE_MAX];
+    debug_decl(sudo_parseln, SUDO_DEBUG_UTIL)
+
+    if (fgets(buf, sizeof(buf), fp) != NULL) {
+       /* Remove comments */
+       if ((cp = strchr(buf, '#')) != NULL)
+           *cp = '\0';
+
+       /* Trim leading and trailing whitespace/newline */
+       len = strlen(buf);
+       while (len > 0 && isspace((unsigned char)buf[len - 1]))
+           buf[--len] = '\0';
+       for (cp = buf; isblank((unsigned char)*cp); cp++)
+           continue;
+    }
+    debug_return_str(cp);
+}