X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-remote.c;h=31401fb3ee7e6e51d81a1abae3f06316baa3c86e;hb=e94b5a7bc201fe73c4a291169c5c1d21cceee128;hp=794298fe6f76a1c09431ed5f1e24ee0fbff479b5;hpb=ca2d37841476e6272c9957c3f5a0cbe869a531ca;p=elogind.git

diff --git a/src/journal/journal-remote.c b/src/journal/journal-remote.c
index 794298fe6..31401fb3e 100644
--- a/src/journal/journal-remote.c
+++ b/src/journal/journal-remote.c
@@ -42,7 +42,6 @@
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
-#include "socket-util.h"
 #include "microhttpd-util.h"
 
 #ifdef HAVE_GNUTLS
@@ -186,7 +185,7 @@ static int open_output(Writer *s, const char* url) {
                 if (r < 0)
                         return log_oom();
         } else {
-                r = is_dir(arg_output);
+                r = is_dir(arg_output, true);
                 if (r > 0) {
                         r = asprintf(&output,
                                      "%s/remote-%s.journal", arg_output, name);
@@ -292,7 +291,7 @@ static int remove_source(RemoteServer *s, int fd) {
 
 static int add_source(RemoteServer *s, int fd, const char* name) {
         RemoteSource *source = NULL;
-        char *realname;
+        _cleanup_free_ char *realname = NULL;
         int r;
 
         assert(s);
@@ -308,11 +307,11 @@ static int add_source(RemoteServer *s, int fd, const char* name) {
                         return log_oom();
         }
 
-        log_debug("Creating source for fd:%d (%s)", fd, name);
+        log_debug("Creating source for fd:%d (%s)", fd, realname);
 
         r = get_source_for_fd(s, fd, &source);
         if (r < 0) {
-                log_error("Failed to create source for fd:%d (%s)", fd, name);
+                log_error("Failed to create source for fd:%d (%s)", fd, realname);
                 return r;
         }
         assert(source);
@@ -1211,8 +1210,8 @@ int main(int argc, char **argv) {
         if (remoteserver_init(&s) < 0)
                 return EXIT_FAILURE;
 
-        log_debug("%s running as pid %lu",
-                  program_invocation_short_name, (unsigned long) getpid());
+        log_debug("%s running as pid "PID_FMT,
+                  program_invocation_short_name, getpid());
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");