chiark / gitweb /
Prep v230: Move musl_missing and parse-printf-format to libshared.
authorSven Eden <yamakuzure@gmx.net>
Wed, 7 Jun 2017 10:10:11 +0000 (12:10 +0200)
committerSven Eden <yamakuzure@gmx.net>
Fri, 16 Jun 2017 08:12:58 +0000 (10:12 +0200)
Makefile.am
cb/elogind.cbp
src/cgroups-agent/cgroups-agent.c
src/libelogind/sd-login/test-login.c
src/shared/musl_missing.c [moved from src/basic/musl_missing.c with 100% similarity]
src/shared/musl_missing.h [moved from src/basic/musl_missing.h with 100% similarity]
src/shared/parse-printf-format.c [moved from src/basic/parse-printf-format.c with 100% similarity]
src/shared/parse-printf-format.h [moved from src/basic/parse-printf-format.h with 100% similarity]

index 45b6447..67238fa 100644 (file)
@@ -298,8 +298,6 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
        src/basic/missing.h \
-       src/basic/musl_missing.h \
-       src/basic/musl_missing.c \
        src/basic/capability-util.c \
        src/basic/capability-util.h \
        src/basic/conf-files.c \
@@ -413,9 +411,7 @@ libbasic_la_SOURCES = \
        src/basic/copy.c \
        src/basic/copy.h \
        src/basic/alloc-util.h \
-       src/basic/alloc-util.c \
-       src/basic/parse-printf-format.c \
-       src/basic/parse-printf-format.h
+       src/basic/alloc-util.c
 
 nodist_libbasic_la_SOURCES = \
        src/basic/errno-from-name.h \
@@ -441,16 +437,20 @@ noinst_LTLIBRARIES += \
        libshared.la
 
 libshared_la_SOURCES = \
+       src/shared/bus-util.c \
+       src/shared/bus-util.h \
+       src/shared/clean-ipc.c \
+       src/shared/clean-ipc.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
+       src/shared/musl_missing.h \
+       src/shared/musl_missing.c \
        src/shared/pager.c \
        src/shared/pager.h \
+       src/shared/parse-printf-format.c \
+       src/shared/parse-printf-format.h \
        src/shared/spawn-polkit-agent.c \
-       src/shared/spawn-polkit-agent.h \
-       src/shared/clean-ipc.c \
-       src/shared/clean-ipc.h \
-       src/shared/bus-util.c \
-       src/shared/bus-util.h
+       src/shared/spawn-polkit-agent.h
 
 if HAVE_ACL
 libshared_la_SOURCES += \
index 80edb8b..63f9171 100644 (file)
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/basic/mount-util.h" />
-               <Unit filename="../src/basic/musl_missing.c">
-                       <Option compilerVar="CC" />
-               </Unit>
-               <Unit filename="../src/basic/musl_missing.h" />
-               <Unit filename="../src/basic/parse-printf-format.c">
-                       <Option compilerVar="CC" />
-               </Unit>
-               <Unit filename="../src/basic/parse-printf-format.h" />
                <Unit filename="../src/basic/parse-util.c">
                        <Option compilerVar="CC" />
                </Unit>
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/shared/conf-parser.h" />
+               <Unit filename="../src/shared/musl_missing.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="../src/shared/musl_missing.h" />
                <Unit filename="../src/shared/pager.c">
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/shared/pager.h" />
+               <Unit filename="../src/shared/parse-printf-format.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="../src/shared/parse-printf-format.h" />
                <Unit filename="../src/shared/spawn-polkit-agent.c">
                        <Option compilerVar="CC" />
                </Unit>
index d5f971b..9fb7e34 100644 (file)
 #include <sys/socket.h>
 
 #include "fd-util.h"
-#include "musl_missing.h"
 #include "log.h"
 #include "socket-util.h"
 
+/// Additional includes needed by elogind
+#include "musl_missing.h"
+
 int main(int argc, char *argv[]) {
 
         static const union sockaddr_union sa = {
index c1fd7dd..e0a838d 100644 (file)
@@ -29,6 +29,9 @@
 #include "strv.h"
 #include "util.h"
 
+/// Additional includes needed by elogind
+#include "musl_missing.h"
+
 static void test_login(void) {
         _cleanup_close_pair_ int pair[2] = { -1, -1 };
         _cleanup_free_ char *pp = NULL, *qq = NULL;
@@ -255,6 +258,7 @@ static void test_login(void) {
 }
 
 int main(int argc, char* argv[]) {
+        elogind_set_program_name(argv[0]);
         log_parse_environment();
         log_open();