Move lib/util from source4 to top-level libutil.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 11 Oct 2008 19:05:38 +0000 (21:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 11 Oct 2008 19:05:38 +0000 (21:05 +0200)
Conflicts:

source4/Makefile

65 files changed:
.gitignore
lib/util/Doxyfile [moved from source4/lib/util/Doxyfile with 100% similarity]
lib/util/asn1.c [moved from source4/lib/util/asn1.c with 100% similarity]
lib/util/asn1.h [moved from source4/lib/util/asn1.h with 100% similarity]
lib/util/attr.h [moved from source4/lib/util/attr.h with 100% similarity]
lib/util/become_daemon.c [moved from source4/lib/util/become_daemon.c with 100% similarity]
lib/util/byteorder.h [moved from source4/lib/util/byteorder.h with 100% similarity]
lib/util/capability.c [moved from source4/lib/util/capability.c with 100% similarity]
lib/util/capability.m4 [moved from source4/lib/util/capability.m4 with 100% similarity]
lib/util/config.mk [moved from source4/lib/util/config.mk with 100% similarity]
lib/util/data_blob.c [moved from source4/lib/util/data_blob.c with 100% similarity]
lib/util/data_blob.h [moved from source4/lib/util/data_blob.h with 100% similarity]
lib/util/debug.c [moved from source4/lib/util/debug.c with 100% similarity]
lib/util/debug.h [moved from source4/lib/util/debug.h with 100% similarity]
lib/util/dlinklist.h [moved from source4/lib/util/dlinklist.h with 100% similarity]
lib/util/dprintf.c [moved from source4/lib/util/dprintf.c with 100% similarity]
lib/util/fault.c [moved from source4/lib/util/fault.c with 100% similarity]
lib/util/fault.m4 [moved from source4/lib/util/fault.m4 with 100% similarity]
lib/util/fsusage.c [moved from source4/lib/util/fsusage.c with 100% similarity]
lib/util/fsusage.m4 [moved from source4/lib/util/fsusage.m4 with 100% similarity]
lib/util/genrand.c [moved from source4/lib/util/genrand.c with 100% similarity]
lib/util/idtree.c [moved from source4/lib/util/idtree.c with 100% similarity]
lib/util/mainpage.dox [moved from source4/lib/util/mainpage.dox with 100% similarity]
lib/util/ms_fnmatch.c [moved from source4/lib/util/ms_fnmatch.c with 100% similarity]
lib/util/mutex.c [moved from source4/lib/util/mutex.c with 100% similarity]
lib/util/mutex.h [moved from source4/lib/util/mutex.h with 100% similarity]
lib/util/params.c [moved from source4/lib/util/params.c with 100% similarity]
lib/util/safe_string.h [moved from source4/lib/util/safe_string.h with 100% similarity]
lib/util/signal.c [moved from source4/lib/util/signal.c with 100% similarity]
lib/util/signal.m4 [moved from source4/lib/util/signal.m4 with 100% similarity]
lib/util/system.c [moved from source4/lib/util/system.c with 100% similarity]
lib/util/tests/file.c [moved from source4/lib/util/tests/file.c with 100% similarity]
lib/util/tests/genrand.c [moved from source4/lib/util/tests/genrand.c with 100% similarity]
lib/util/tests/idtree.c [moved from source4/lib/util/tests/idtree.c with 100% similarity]
lib/util/tests/str.c [moved from source4/lib/util/tests/str.c with 100% similarity]
lib/util/tests/strlist.c [moved from source4/lib/util/tests/strlist.c with 100% similarity]
lib/util/time.c [moved from source4/lib/util/time.c with 100% similarity]
lib/util/time.h [moved from source4/lib/util/time.h with 100% similarity]
lib/util/time.m4 [moved from source4/lib/util/time.m4 with 100% similarity]
lib/util/unix_privs.c [moved from source4/lib/util/unix_privs.c with 100% similarity]
lib/util/util.c [moved from source4/lib/util/util.c with 100% similarity]
lib/util/util.h [moved from source4/lib/util/util.h with 99% similarity]
lib/util/util.m4 [moved from source4/lib/util/util.m4 with 100% similarity]
lib/util/util_file.c [moved from source4/lib/util/util_file.c with 100% similarity]
lib/util/util_getent.c [moved from source4/lib/util/util_getent.c with 100% similarity]
lib/util/util_ldb.c [moved from source4/lib/util/util_ldb.c with 100% similarity]
lib/util/util_ldb.h [moved from source4/lib/util/util_ldb.h with 100% similarity]
lib/util/util_pw.c [moved from source4/lib/util/util_pw.c with 100% similarity]
lib/util/util_str.c [moved from source4/lib/util/util_str.c with 100% similarity]
lib/util/util_strlist.c [moved from source4/lib/util/util_strlist.c with 100% similarity]
lib/util/util_tdb.c [moved from source4/lib/util/util_tdb.c with 100% similarity]
lib/util/wrap_xattr.c [moved from source4/lib/util/wrap_xattr.c with 100% similarity]
lib/util/wrap_xattr.h [moved from source4/lib/util/wrap_xattr.h with 100% similarity]
lib/util/xattr.m4 [moved from source4/lib/util/xattr.m4 with 100% similarity]
lib/util/xfile.c [moved from source4/lib/util/xfile.c with 100% similarity]
lib/util/xfile.h [moved from source4/lib/util/xfile.h with 100% similarity]
source4/Makefile
source4/auth/credentials/credentials.h
source4/configure.ac
source4/include/includes.h
source4/librpc/ndr/libndr.h
source4/librpc/rpc/dcerpc.h
source4/main.mk
source4/torture/local/config.mk
source4/utils/getntacl.c

index e585504..fa4fc5f 100644 (file)
@@ -231,11 +231,11 @@ source4/lib/tdb/bin/tdbtool
 source4/lib/tdb/bin/tdbtorture
 source4/lib/tdr/tdr_proto.h
 source4/lib/util/apidocs
-source4/lib/util/asn1_proto.h
-source4/lib/util/pidfile.h
-source4/lib/util/unix_privs.h
-source4/lib/util/util_proto.h
-source4/lib/util/util_tdb.h
+lib/util/asn1_proto.h
+lib/util/pidfile.h
+lib/util/unix_privs.h
+lib/util/util_proto.h
+lib/util/util_tdb.h
 source4/mkconfig.mk
 source4/nbt_server/dgram/proto.h
 source4/nbt_server/nbt_server_proto.h
similarity index 100%
rename from source4/lib/util/Doxyfile
rename to lib/util/Doxyfile
similarity index 100%
rename from source4/lib/util/asn1.c
rename to lib/util/asn1.c
similarity index 100%
rename from source4/lib/util/asn1.h
rename to lib/util/asn1.h
similarity index 100%
rename from source4/lib/util/attr.h
rename to lib/util/attr.h
similarity index 100%
rename from source4/lib/util/debug.c
rename to lib/util/debug.c
similarity index 100%
rename from source4/lib/util/debug.h
rename to lib/util/debug.h
similarity index 100%
rename from source4/lib/util/fault.c
rename to lib/util/fault.c
similarity index 100%
rename from source4/lib/util/fault.m4
rename to lib/util/fault.m4
similarity index 100%
rename from source4/lib/util/idtree.c
rename to lib/util/idtree.c
similarity index 100%
rename from source4/lib/util/mutex.c
rename to lib/util/mutex.c
similarity index 100%
rename from source4/lib/util/mutex.h
rename to lib/util/mutex.h
similarity index 100%
rename from source4/lib/util/params.c
rename to lib/util/params.c
similarity index 100%
rename from source4/lib/util/signal.c
rename to lib/util/signal.c
similarity index 100%
rename from source4/lib/util/system.c
rename to lib/util/system.c
similarity index 100%
rename from source4/lib/util/time.c
rename to lib/util/time.c
similarity index 100%
rename from source4/lib/util/time.h
rename to lib/util/time.h
similarity index 100%
rename from source4/lib/util/time.m4
rename to lib/util/time.m4
similarity index 100%
rename from source4/lib/util/util.c
rename to lib/util/util.c
similarity index 99%
rename from source4/lib/util/util.h
rename to lib/util/util.h
index ffe83c1..4616de9 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef _SAMBA_UTIL_H_
 #define _SAMBA_UTIL_H_
 
-#include "util/attr.h"
+#include "../lib/util/attr.h"
 
 #include "charset/charset.h"
 
@@ -38,12 +38,12 @@ struct smbsrv_tcon;
 extern const char *logfile;
 extern const char *panic_action;
 
-#include "util/time.h"
-#include "util/data_blob.h"
-#include "util/xfile.h"
-#include "util/debug.h"
-#include "util/mutex.h"
-#include "util/byteorder.h"
+#include "../lib/util/time.h"
+#include "../lib/util/data_blob.h"
+#include "../lib/util/xfile.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/mutex.h"
+#include "../lib/util/byteorder.h"
 
 /**
   this is a warning hack. The idea is to use this everywhere that we
similarity index 100%
rename from source4/lib/util/util.m4
rename to lib/util/util.m4
similarity index 100%
rename from source4/lib/util/xattr.m4
rename to lib/util/xattr.m4
similarity index 100%
rename from source4/lib/util/xfile.c
rename to lib/util/xfile.c
similarity index 100%
rename from source4/lib/util/xfile.h
rename to lib/util/xfile.h
index cab8267..345c16e 100644 (file)
@@ -74,7 +74,7 @@ socketwrappersrcdir := ../lib/socket_wrapper
 nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
-libutilsrcdir := lib/util
+libutilsrcdir := ../lib/util
 libtdrsrcdir := lib/tdr
 libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := ../lib/crypto
@@ -144,7 +144,7 @@ endif
 clean::
        @find ../lib ../libcli -name '*.o' -o -name '*.hd' | xargs rm -f
 
-DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
+DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
                  $(srcdir)/version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
index 79c50ae..52b10c6 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef __CREDENTIALS_H__
 #define __CREDENTIALS_H__
 
-#include "util/data_blob.h"
+#include "../lib/util/data_blob.h"
 #include "librpc/gen_ndr/misc.h"
 
 struct ccache_container;
index 611b8dd..62f9dc4 100644 (file)
@@ -14,13 +14,13 @@ m4_include(build/m4/env.m4)
 m4_include(../lib/replace/samba.m4)
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/config.m4)
-m4_include(lib/util/fault.m4)
-m4_include(lib/util/signal.m4)
-m4_include(lib/util/util.m4)
-m4_include(lib/util/fsusage.m4)
-m4_include(lib/util/xattr.m4)
-m4_include(lib/util/capability.m4)
-m4_include(lib/util/time.m4)
+m4_include(../lib/util/fault.m4)
+m4_include(../lib/util/signal.m4)
+m4_include(../lib/util/util.m4)
+m4_include(../lib/util/fsusage.m4)
+m4_include(../lib/util/xattr.m4)
+m4_include(../lib/util/capability.m4)
+m4_include(../lib/util/time.m4)
 m4_include(../lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
index 750ebc4..1386ea5 100644 (file)
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "util/util.h"
+#include "../lib/util/util.h"
 
 #include "libcli/util/error.h"
 
 /* String routines */
-#include "util/safe_string.h"
+#include "../lib/util/safe_string.h"
 
 #if 0
 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
index 3f4de78..1be1a54 100644 (file)
@@ -26,7 +26,7 @@
 #define __LIBNDR_H__
 
 #include <talloc.h>
-#include "lib/util/util.h" /* for discard_const */
+#include "../lib/util/util.h" /* for discard_const */
 #include <sys/time.h>
 #include "lib/charset/charset.h"
 
index 2b38c65..482e803 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
-#include "lib/util/data_blob.h"
+#include "../lib/util/data_blob.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/libndr.h"
 
index 368dce9..8ce86b9 100644 (file)
@@ -19,7 +19,7 @@ mkinclude lib/cmdline/config.mk
 mkinclude ../lib/socket_wrapper/config.mk
 mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/stream/config.mk
-mkinclude lib/util/config.mk
+mkinclude ../lib/util/config.mk
 mkinclude lib/tdr/config.mk
 mkinclude lib/dbwrap/config.mk
 mkinclude ../lib/crypto/config.mk
index 4cd9f6c..1f87912 100644 (file)
@@ -28,14 +28,14 @@ TORTURE_LOCAL_OBJ_FILES = \
                $(torturesrcdir)/../lib/messaging/tests/messaging.o \
                $(torturesrcdir)/../lib/messaging/tests/irpc.o \
                $(torturesrcdir)/../librpc/tests/binding_string.o \
-               $(torturesrcdir)/../lib/util/tests/idtree.o \
+               $(torturesrcdir)/../../lib/util/tests/idtree.o \
                $(torturesrcdir)/../lib/socket/testsuite.o \
                $(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
                $(torturesrcdir)/../libcli/resolve/testsuite.o \
-               $(torturesrcdir)/../lib/util/tests/strlist.o \
-               $(torturesrcdir)/../lib/util/tests/str.o \
-               $(torturesrcdir)/../lib/util/tests/file.o \
-               $(torturesrcdir)/../lib/util/tests/genrand.o \
+               $(torturesrcdir)/../../lib/util/tests/strlist.o \
+               $(torturesrcdir)/../../lib/util/tests/str.o \
+               $(torturesrcdir)/../../lib/util/tests/file.o \
+               $(torturesrcdir)/../../lib/util/tests/genrand.o \
                $(torturesrcdir)/../../lib/compression/testsuite.o \
                $(torturesrcdir)/../lib/charset/tests/charset.o \
                $(torturesrcdir)/../libcli/security/tests/sddl.o \
index 132d689..f26c87b 100644 (file)
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
-#include "lib/util/wrap_xattr.h"
+#include "../lib/util/wrap_xattr.h"
 #include "param/param.h"
 
 static void ntacl_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);