summaryrefslogtreecommitdiffstats
path: root/src/customdhcpcd/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/customdhcpcd/common.c')
-rw-r--r--src/customdhcpcd/common.c285
1 files changed, 149 insertions, 136 deletions
diff --git a/src/customdhcpcd/common.c b/src/customdhcpcd/common.c
index 99471bc..707ea32 100644
--- a/src/customdhcpcd/common.c
+++ b/src/customdhcpcd/common.c
@@ -1,4 +1,4 @@
-/*
+/*
* dhcpcd - DHCP client daemon
* Copyright 2006-2008 Roy Marples <roy@marples.name>
* All rights reserved
@@ -41,28 +41,30 @@
* This means we read the whole line and avoid any nasty buffer overflows. */
char *get_line (FILE *fp)
{
- char *line = NULL;
- char *p;
- size_t len = 0;
- size_t last = 0;
-
- if (feof (fp))
- return (NULL);
-
- do {
- len += BUFSIZ;
- line = xrealloc (line, sizeof (char) * len);
- p = line + last;
- memset (p, 0, BUFSIZ);
- fgets (p, BUFSIZ, fp);
- last += strlen (p);
- } while (! feof (fp) && line[last - 1] != '\n');
-
- /* Trim the trailing newline */
- if (*line && line[--last] == '\n')
- line[last] = '\0';
-
- return (line);
+ char *line = NULL;
+ char *p;
+ size_t len = 0;
+ size_t last = 0;
+
+ if (feof (fp))
+ return (NULL);
+
+ do
+ {
+ len += BUFSIZ;
+ line = xrealloc (line, sizeof (char) * len);
+ p = line + last;
+ memset (p, 0, BUFSIZ);
+ fgets (p, BUFSIZ, fp);
+ last += strlen (p);
+ }
+ while (! feof (fp) && line[last - 1] != '\n');
+
+ /* Trim the trailing newline */
+ if (*line && line[--last] == '\n')
+ line[last] = '\0';
+
+ return (line);
}
/* OK, this should be in dhcpcd.c
@@ -70,19 +72,20 @@ char *get_line (FILE *fp)
#ifndef HAVE_SRANDOMDEV
void srandomdev (void)
{
- int fd;
- unsigned long seed;
-
- fd = open ("/dev/urandom", 0);
- if (fd == -1 || read (fd, &seed, sizeof (seed)) == -1) {
- logger (LOG_WARNING, "Could not read from /dev/urandom: %s",
- strerror (errno));
- seed = time (0);
- }
- if (fd >= 0)
- close(fd);
-
- srandom (seed);
+ int fd;
+ unsigned long seed;
+
+ fd = open ("/dev/urandom", 0);
+ if (fd == -1 || read (fd, &seed, sizeof (seed)) == -1)
+ {
+ logger (LOG_WARNING, "Could not read from /dev/urandom: %s",
+ strerror (errno));
+ seed = time (0);
+ }
+ if (fd >= 0)
+ close(fd);
+
+ srandom (seed);
}
#endif
@@ -90,54 +93,58 @@ void srandomdev (void)
#ifndef HAVE_STRLCPY
size_t strlcpy (char *dst, const char *src, size_t size)
{
- const char *s = src;
- size_t n = size;
-
- if (n && --n)
- do {
- if (! (*dst++ = *src++))
- break;
- } while (--n);
-
- if (! n) {
- if (size)
- *dst = '\0';
- while (*src++);
- }
-
- return (src - s - 1);
+ const char *s = src;
+ size_t n = size;
+
+ if (n && --n)
+ do
+ {
+ if (! (*dst++ = *src++))
+ break;
+ }
+ while (--n);
+
+ if (! n)
+ {
+ if (size)
+ *dst = '\0';
+ while (*src++);
+ }
+
+ return (src - s - 1);
}
#endif
/* Close our fd's */
int close_fds (void)
{
- int fd;
-
- if ((fd = open ("/dev/null", O_RDWR)) == -1) {
- logger (LOG_ERR, "open `/dev/null': %s", strerror (errno));
- return (-1);
- }
-
- dup2 (fd, fileno (stdin));
- dup2 (fd, fileno (stdout));
- dup2 (fd, fileno (stderr));
- if (fd > 2)
- close (fd);
- return (0);
+ int fd;
+
+ if ((fd = open ("/dev/null", O_RDWR)) == -1)
+ {
+ logger (LOG_ERR, "open `/dev/null': %s", strerror (errno));
+ return (-1);
+ }
+
+ dup2 (fd, fileno (stdin));
+ dup2 (fd, fileno (stdout));
+ dup2 (fd, fileno (stderr));
+ if (fd > 2)
+ close (fd);
+ return (0);
}
int close_on_exec (int fd)
{
- int flags;
-
- if ((flags = fcntl (fd, F_GETFD, 0)) == -1
- || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) == -1)
- {
- logger (LOG_ERR, "fcntl: %s", strerror (errno));
- return (-1);
- }
- return (0);
+ int flags;
+
+ if ((flags = fcntl (fd, F_GETFD, 0)) == -1
+ || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) == -1)
+ {
+ logger (LOG_ERR, "fcntl: %s", strerror (errno));
+ return (-1);
+ }
+ return (0);
}
/* Handy function to get the time.
@@ -148,102 +155,108 @@ int close_on_exec (int fd)
int get_time (struct timeval *tp)
{
#if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC)
- struct timespec ts;
- static clockid_t posix_clock;
- static int posix_clock_set = 0;
-
- if (! posix_clock_set) {
- if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
- posix_clock = CLOCK_MONOTONIC;
- else
- posix_clock = CLOCK_REALTIME;
- posix_clock_set = 1;
- }
-
- if (clock_gettime (posix_clock, &ts) == -1) {
- logger (LOG_ERR, "clock_gettime: %s", strerror (errno));
- return (-1);
- }
-
- tp->tv_sec = ts.tv_sec;
- tp->tv_usec = ts.tv_nsec / 1000;
- return (0);
+ struct timespec ts;
+ static clockid_t posix_clock;
+ static int posix_clock_set = 0;
+
+ if (! posix_clock_set)
+ {
+ if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
+ posix_clock = CLOCK_MONOTONIC;
+ else
+ posix_clock = CLOCK_REALTIME;
+ posix_clock_set = 1;
+ }
+
+ if (clock_gettime (posix_clock, &ts) == -1)
+ {
+ logger (LOG_ERR, "clock_gettime: %s", strerror (errno));
+ return (-1);
+ }
+
+ tp->tv_sec = ts.tv_sec;
+ tp->tv_usec = ts.tv_nsec / 1000;
+ return (0);
#else
- if (gettimeofday (tp, NULL) == -1) {
- logger (LOG_ERR, "gettimeofday: %s", strerror (errno));
- return (-1);
- }
- return (0);
+ if (gettimeofday (tp, NULL) == -1)
+ {
+ logger (LOG_ERR, "gettimeofday: %s", strerror (errno));
+ return (-1);
+ }
+ return (0);
#endif
}
time_t uptime (void)
{
- struct timeval tp;
+ struct timeval tp;
- if (get_time (&tp) == -1)
- return (-1);
+ if (get_time (&tp) == -1)
+ return (-1);
- return (tp.tv_sec);
+ return (tp.tv_sec);
}
void writepid (int fd, pid_t pid)
{
- char spid[16];
- if (ftruncate (fd, (off_t) 0) == -1) {
- logger (LOG_ERR, "ftruncate: %s", strerror (errno));
- } else {
- ssize_t len;
- snprintf (spid, sizeof (spid), "%u", pid);
- len = pwrite (fd, spid, strlen (spid), (off_t) 0);
- if (len != (ssize_t) strlen (spid))
- logger (LOG_ERR, "pwrite: %s", strerror (errno));
- }
+ char spid[16];
+ if (ftruncate (fd, (off_t) 0) == -1)
+ {
+ logger (LOG_ERR, "ftruncate: %s", strerror (errno));
+ }
+ else
+ {
+ ssize_t len;
+ snprintf (spid, sizeof (spid), "%u", pid);
+ len = pwrite (fd, spid, strlen (spid), (off_t) 0);
+ if (len != (ssize_t) strlen (spid))
+ logger (LOG_ERR, "pwrite: %s", strerror (errno));
+ }
}
void *xmalloc (size_t s)
{
- void *value = malloc (s);
+ void *value = malloc (s);
- if (value)
- return (value);
+ if (value)
+ return (value);
- logger (LOG_ERR, "memory exhausted");
+ logger (LOG_ERR, "memory exhausted");
- exit (EXIT_FAILURE);
- /* NOTREACHED */
+ exit (EXIT_FAILURE);
+ /* NOTREACHED */
}
void *xzalloc (size_t s)
{
- void *value = xmalloc (s);
- memset (value, 0, s);
- return (value);
+ void *value = xmalloc (s);
+ memset (value, 0, s);
+ return (value);
}
void *xrealloc (void *ptr, size_t s)
{
- void *value = realloc (ptr, s);
+ void *value = realloc (ptr, s);
- if (value)
- return (value);
+ if (value)
+ return (value);
- logger (LOG_ERR, "memory exhausted");
- exit (EXIT_FAILURE);
- /* NOTREACHED */
+ logger (LOG_ERR, "memory exhausted");
+ exit (EXIT_FAILURE);
+ /* NOTREACHED */
}
char *xstrdup (const char *str)
{
- char *value;
+ char *value;
- if (! str)
- return (NULL);
+ if (! str)
+ return (NULL);
- if ((value = strdup (str)))
- return (value);
+ if ((value = strdup (str)))
+ return (value);
- logger (LOG_ERR, "memory exhausted");
- exit (EXIT_FAILURE);
- /* NOTREACHED */
+ logger (LOG_ERR, "memory exhausted");
+ exit (EXIT_FAILURE);
+ /* NOTREACHED */
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-18 11:15:41 +0200