Merge branch 'master' into 1.1

[meshlink] / lib / dropin.c

diff --git a/lib/dropin.c b/lib/dropin.c
index 23d2b136f304f798ffe9536da0fdee66d23afaaa..4ad32378bdbb541c90ac9e1303d8da059ff9988a 100644 (file)
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -38,8 +38,7 @@
   Unless the argument noclose is non-zero, daemon() will redirect
   standard input, standard output and standard error to /dev/null.
 */
-int daemon(int nochdir, int noclose)
-{
+int daemon(int nochdir, int noclose) {
 #ifdef HAVE_FORK
        pid_t pid;
        int fd;
@@ -97,8 +96,7 @@ int daemon(int nochdir, int noclose)
   current directory name.  If the environment variable PWD is set, and
   its value is correct, then that value will be returned.
 */
-char *get_current_dir_name(void)
-{
+char *get_current_dir_name(void) {
        size_t size;
        char *buf;
        char *r;
@@ -135,7 +133,6 @@ int asprintf(char **buf, const char *fmt, ...) {
 }
 
 int vasprintf(char **buf, const char *fmt, va_list ap) {
-{
        int status;
        va_list aq;
        int len;
@@ -168,15 +165,3 @@ int gettimeofday(struct timeval *tv, void *tz) {
        return 0;
 }
 #endif
-
-#ifndef HAVE_RANDOM
-#include <openssl/rand.h>
-
-long int random(void) {
-       long int x;
-       
-       RAND_pseudo_bytes((unsigned char *)&x, sizeof(x));
-
-       return x;
-}
-#endif