Move string manipulation functions out of util

Some functions in libafsutil depend upon the RX libraries, which means
that pulling in other functions in this library can create a dependency
upon RX. This is less than ideal for low-level libraries such as cmd and
comerr.

So, create a new low-level library (currently named 'opr') which can
contain low-level functions from util, and elsewhere. This library
should have no dependencies other than on system libraries and libroken.

Change-Id: I703db3da4d8faf79ee82bf572af09d07152d9b25
Reviewed-on: http://gerrit.openafs.org/5363
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>

diff --git a/Makefile.in b/Makefile.in
index a51ad4f726fbbdf4b280038927a8bdfe568fa559..3125245c32a76c96b602caf7adf12a8a09679a3d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,10 @@ config: prelude
 procmgmt: $(DIR_roken) config
        +${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall
+opr: config $(DIR_roken)
+       +${COMPILE_PART1} opr ${COMPILE_PART2}
+
+util: opr $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall
        +${COMPILE_PART1} util ${COMPILE_PART2}
 
 libafscp: util afs volser vlserver rx auth fsint
@@ -694,6 +697,7 @@ clean2:
        -${COMPILE_PART1} config ${COMPILE_CLEAN}
        -${COMPILE_PART1} procmgmt ${COMPILE_CLEAN}
        -${COMPILE_PART1} util ${COMPILE_CLEAN}
+       -${COMPILE_PART1} opr ${COMPILE_CLEAN}
        -${COMPILE_PART1} libafscp ${COMPILE_CLEAN}
        -${COMPILE_PART1} audit ${COMPILE_CLEAN}
        -${COMPILE_PART1} comerr ${COMPILE_CLEAN}
@@ -869,6 +873,7 @@ distclean: clean
        src/log/test/Makefile \
        src/lwp/Makefile \
        src/lwp/test/Makefile \
+       src/opr/Makefile \
        src/packaging/Debian/changelog \
        src/packaging/MacOS/OpenAFS-debug.Description.plist \
        src/packaging/MacOS/OpenAFS-debug.Info.plist \

diff --git a/NTMakefile b/NTMakefile
index 7198d4291e8d467a0cd2351331d13b6bef5a73d4..deab98b9855eab70e54765832526578392ce714d 100644 (file)
--- a/NTMakefile
+++ b/NTMakefile
@@ -89,13 +89,20 @@ rx_headers:
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
-util_headers: roken_headers
+util_headers: opr_headers
      @echo ***** $@
        $(DOCD) $(SRC)\util
        $(CD) $(SRC)\util
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
+opr_headers: roken_headers
+     @echo ***** $@
+       $(DOCD) $(SRC)\opr
+       $(CD) $(SRC)\opr
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
 roken_headers:
      @echo ***** $@
        $(DOCD) $(SRC)\roken
@@ -117,7 +124,7 @@ pthread: hcrypto_headers
        $(NTMAKE)
        $(CD) ..\..\..
 
-util: procmgmt_headers afsreg_headers lwp_headers rx_headers hcrypto
+util: procmgmt_headers afsreg_headers lwp_headers rx_headers opr
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -173,6 +180,13 @@ rxgen: lwp
        $(NTMAKE)
        $(CD) ..\..
 
+opr: hcrypto
+     @echo ***** $@
+       $(DOCD) $(SRC)\opr
+       $(CD) $(SRC)\opr
+       $(NTMAKE)
+       $(CD) ..\..\..
+
 hcrypto: roken
      @echo ***** $@
        $(DOCD) $(SRC)\crypto\hcrypto

diff --git a/configure.ac b/configure.ac
index 56ee4c22df7d46a4c4924bffa88ceeb14a35be21..4780988257ac4829aa532d5ce919d1cd9add3594 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,7 @@ src/log/Makefile \
 src/log/test/Makefile \
 src/lwp/Makefile \
 src/lwp/test/Makefile \
+src/opr/Makefile \
 src/packaging/Debian/changelog \
 src/packaging/MacOS/OpenAFS-debug.Description.plist \
 src/packaging/MacOS/OpenAFS-debug.Info.plist \

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 8e23f97e6473572ec00f5a682f8da6e79ec03b6a..77b0a0c654c84dc3578ebd44b4d99cbca06222b2 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -299,6 +299,7 @@ LOGON_DLLLIBS =\
     $(DESTDIR)\lib\libafsconf.lib \
     $(DESTDIR)\lib\afs\afscom_err.lib \
     $(DESTDIR)\lib\afs\afsutil.lib \
+    $(DESTDIR)\lib\opr.lib \
     $(DESTDIR)\lib\afsroken.lib \
     $(LANAHELPERLIB) \
     $(AFSKFWLIB)
@@ -381,6 +382,7 @@ EXELIBS = \
        $(DESTDIR)\lib\afslwp.lib \
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 
@@ -396,12 +398,14 @@ EXELIBS2 = \
        $(DESTDIR)\lib\afslwp.lib \
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 EXELIBS3 = \
        $(DESTDIR)\lib\afs\afscmd.lib \
        $(DESTDIR)\lib\afsrxkad.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 
@@ -554,6 +558,7 @@ KPASSWD_LIBS =\
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afs\afscmd.lib \
        $(DESTDIR)\lib\afs\mtafsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/WINNT/afssvrmgr/NTMakefile b/src/WINNT/afssvrmgr/NTMakefile
index ed45e5bc046cdf7044ee4b2242f6203a911dcdec..258732048927355d2d2d57f46ffd516a9ecd0289 100644 (file)
--- a/src/WINNT/afssvrmgr/NTMakefile
+++ b/src/WINNT/afssvrmgr/NTMakefile
@@ -102,6 +102,7 @@ EXELIBS = \
        $(DESTDIR)\lib\afs\AfsClass.lib \
        $(DESTDIR)\lib\afs\TaAfsAppLib.lib \
         $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 ############################################################################

diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile
index 8cfac1d33c7f1e95fb6ac237984b8afc1e6d32aa..92a67586a5c87ece2a9c89f0c86c29f3b22c6e7a 100644 (file)
--- a/src/WINNT/aklog/NTMakefile
+++ b/src/WINNT/aklog/NTMakefile
@@ -38,6 +38,7 @@ EXELIBS = \
         $(DESTDIR)\lib\afs\afskauth.lib \
         $(DESTDIR)\lib\afs\afscom_err.lib \
         $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 !IF "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" || "$(CPU)" == "ALPHA64"

diff --git a/src/WINNT/bosctlsvc/NTMakefile b/src/WINNT/bosctlsvc/NTMakefile
index 9be873e5dd86eddf1aa844b2ac9b93d479cdb374..2c94e6f6c926ca924513117a8b95c93a1da8316f 100644 (file)
--- a/src/WINNT/bosctlsvc/NTMakefile
+++ b/src/WINNT/bosctlsvc/NTMakefile
@@ -23,6 +23,7 @@ EXELIBS =\
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
+       $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\afsroken.lib \
         $(DESTDIR)\lib\afsicf.obj
 

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index 239f6886ba90a39e3abde086327a2d6924331856..19aa04736460c3249d8f1198ba86ab8f8f574670 100644 (file)
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -69,6 +69,7 @@ EXELIBS = \
        $(DESTDIR)\lib\lanahelper.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
         $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 ############################################################################

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index ca9ff933c911f06ca4a68003438c007888d9cba2..2e3f6d0ad4278f3713f2807370ab639c5a02679d 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -71,6 +71,7 @@ EXELIBS = \
         $(DESTDIR)\lib\afskfw.lib \
         $(DESTDIR)\lib\afs\afscom_err.lib \
         $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 20a23b3da728fc66f0100f87445c1a69c64767a3..973c10a520cdd9fdcccaa3b078327d9752b5eaa5 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -20,7 +20,15 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
 # Programs
 #
 
-AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a
+AFSLIBS=${TOP_LIBDIR}/libauth.a \
+       ${TOP_LIBDIR}/libcmd.a \
+       ${TOP_LIBDIR}/libsys.a \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/librx.a \
+       ${TOP_LIBDIR}/liblwp.a \
+       ${TOP_LIBDIR}/util.a \
+       $(TOP_LIBDIR)/libopr.a
+
 UAFSLIBS=${TOP_LIBDIR}/libuafs.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a
 
 FUSE_LIBS=@FUSE_LIBS@

diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile
index a04197774986a1ab6a9aeeeb50a7a9c477496430..1c5b5411b5c1fb3e86874deaf206d92bb45619fb 100644 (file)
--- a/src/auth/NTMakefile
+++ b/src/auth/NTMakefile
@@ -94,6 +94,7 @@ EXELIBS =\
        $(EXELIBDIR)\afs\afseventlog.lib \
        $(EXELIBDIR)\afs\afsreg.lib \
        $(EXELIBDIR)\libafsconf.lib \
+       $(EXELIBDIR)\opr.lib \
        $(EXELIBDIR)\afshcrypto.lib \
        $(EXELIBDIR)\afsroken.lib
 

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 896c5e7c23a3e66270ca124d5cebdc7b4e3003d9..46e1c736807e9ca50d3f3976c72c14d8fff56636 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <sys/utime.h>

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 482b6ea7aaedc0d74a6ac42322fc0ef9f2b6a74c..5beb2d81ccb2e1177eb660deea100a5f211f1459 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -15,6 +15,7 @@
 #include <roken.h>
 
 #include <afs/stds.h>
+#include <afs/opr.h>
 #include <afs/pthread_glock.h>
 #include <ctype.h>
 

diff --git a/src/auth/userok.c b/src/auth/userok.c
index b8f81662e7e6f2592261a3d3694ecf9dafa74dd6..3630e7cdbdbe5aaab87319e14f478d0380b25780 100644 (file)
--- a/src/auth/userok.c
+++ b/src/auth/userok.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <ctype.h>
 

diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c
index 3372d271fdfe10209b4909dabbc4f214853cf351..771e0fc19a2c343c4a1b7d6fce35634a16558674 100644 (file)
--- a/src/auth/writeconfig.c
+++ b/src/auth/writeconfig.c
@@ -11,6 +11,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <afs/pthread_glock.h>
 #include <afs/afsutil.h>

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 2b32f949c24be6a4cf0433bc3da46d59bea8c4ed..d9e326c91a7116e130b72e6f49c0c5c3943030a2 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -35,6 +35,7 @@ LIBS=   ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libprocmgmt.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a

diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile
index 01df04cea060c531dc5e432e6520145966efcdf6..c6376cc388729632f9c84d409180891b930e526b 100644 (file)
--- a/src/bozo/NTMakefile
+++ b/src/bozo/NTMakefile
@@ -68,6 +68,7 @@ BOSSERVER_EXELIBS =\
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\libafsconf.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 
@@ -106,6 +107,7 @@ BOS_EXELIBS =\
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afspioctl.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index e108f225e216b2561fbe1275dd4a884c6f81295b..fe9ea215e7e558d41b5cf98101f9b8130ff6e59d 100644 (file)
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -13,6 +13,7 @@
 
 #include <afs/procmgmt.h>
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <hcrypto/ui.h>
 

diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c
index ed4f02d57f8d702234fb9d88045e888539952c3a..14a233ae419c2431b9a150ea52f3ec6f976a2019 100644 (file)
--- a/src/bozo/fsbnodeops.c
+++ b/src/bozo/fsbnodeops.c
@@ -12,6 +12,7 @@
 
 #include <afs/procmgmt.h>
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <lwp.h>
 #include <rx/rx.h>

diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
index 67ae0d8e7a002a0a08814924fe2da981484740b6..d8d07d46401a74abda25c0a929efcc603920c579 100644 (file)
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@@ -19,8 +19,9 @@ LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \
         ${TOP_LIBDIR}/librx.a  ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
         ${TOP_LIBDIR}/libafscom_err.a \
+       ${TOP_LIBDIR}/util.a \
+       $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-       ${TOP_LIBDIR}/util.a
 
 all: ${TOP_LIBDIR}/libbxdb.a ${TOP_INCDIR}/afs/bucoord_prototypes.h ${TOP_INCDIR}/afs/bc.h backup
 

diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 4c6a76c4ab7eb7ffae82c9b25ec887cef4068d87..3085b95cc0f262ce6241fb8a7886e44ccb0af058 100644 (file)
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -91,6 +91,7 @@ EXELIBS =\
        $(DESTDIR)\lib\afs\afspioctl.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
        

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 4b3b77a3d405d2be209ce1d41ddeb33d1694bc89..73fccb3964cf27e1e21734e606b8eed72d8aae96 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -40,8 +40,9 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-       ${TOP_LIBDIR}/util.a
 
 COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
 

diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile
index fb01a1a8a5b4c72a125495101265042b45a273c5..a396dcb7b77d0661252abf3526ac2408479db5c8 100644 (file)
--- a/src/budb/NTMakefile
+++ b/src/budb/NTMakefile
@@ -79,6 +79,7 @@ EXELIBS =\
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\libafsconf.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index d005763e6c60253be940ca0e875b6d10a3599bac..e6c006e33f8646d93e760c4604e5ad3bb93ddad7 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -44,6 +44,7 @@ LIBS=${TOP_LIBDIR}/libbudb.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/libusd.a \
        ${TOP_LIBDIR}/util.a \
+       $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/libprocmgmt.a
 
 TESTOBJS=test.o

diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile
index 8a4c9d3555e851ab82f8632f6fdbbd584066fdd7..cb9d7a7f1a9d1a0383e03ed19f47aec702e636de 100644 (file)
--- a/src/butc/NTMakefile
+++ b/src/butc/NTMakefile
@@ -53,6 +53,7 @@ EXELIBS =\
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index 61c28f809f85d8e88bfe87c6613d840686b94dd7..de2e0202173486893e230a61fb88265d0fed450a 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -11,7 +11,9 @@
 #include <afs/param.h>
 
 #include <afs/procmgmt.h>
+
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"

diff --git a/src/butm/NTMakefile b/src/butm/NTMakefile
index f18e07a077afc50a25d6a35681aecc100e6faada..1012849a3c152146329b62a7f9a44116b5d6f101 100644 (file)
--- a/src/butm/NTMakefile
+++ b/src/butm/NTMakefile
@@ -46,6 +46,7 @@ TESTLIBS = $(DESTDIR)\lib\afslwp.lib \
        $(DESTDIR)\lib\afs\afsusd.lib \
        $(DESTDIR)\lib\afs\afsutil.lib \
        $(DESTDIR)\lib\afs\afsbubasics.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 $(OUT)\test_ftm.exe: $(OUT)\test_ftm.obj $(LIBFILE) $(TESTLIBS)

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index a01b952f20a3408898f5ca4663f8c0115f2ef193..5712f2e871f9dc51cab84dd682a84b9eefabd9d5 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -32,9 +32,9 @@ et_lex.lex.c: et_lex.lex.l
 compile_et:    compile_et.o error_table.o
        case $(SYS_NAME) in \
        *_linux* | *_umlinux* ) \
-       $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil;; \
+       $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr;; \
        * ) \
-       $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \
+       $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll;; \
        esac
 
 libafscom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o

diff --git a/src/comerr/NTMakefile b/src/comerr/NTMakefile
index 7301cc23e610070edb63d5d47831a37c03195cc6..e855c970a5489bb298c56b78fe27be0d630c627b 100644 (file)
--- a/src/comerr/NTMakefile
+++ b/src/comerr/NTMakefile
@@ -61,6 +61,7 @@ $(COMPILE_ET_EXEOBJS): $$(@B).c
 
 COMPILE_ET_EXELIBS =\
        $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 $(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_EXELIBS)  

diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c
index 666ea6d03b24882ff47a0a4d765ea31bb8ddce64..01d5e69d1195372f6ed0bcb202493acb3f5b108f 100644 (file)
--- a/src/comerr/compile_et.c
+++ b/src/comerr/compile_et.c
@@ -12,8 +12,8 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
-#include <afs/afsutil.h>
 #include "mit-sipb-cr.h"
 #include "internal.h"
 #include "compiler.h"

diff --git a/src/comerr/et_name.c b/src/comerr/et_name.c
index fcd73f70594e4605d21d9b83196879f6a8bfb8af..81d326b25d7f056090ef211d7b68acef1b3aa95d 100644 (file)
--- a/src/comerr/et_name.c
+++ b/src/comerr/et_name.c
@@ -9,7 +9,7 @@
 
 #include <roken.h>
 
-#include <afs/afsutil.h>
+#include <afs/opr.h>
 
 #include "error_table.h"
 #include "mit-sipb-cr.h"

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 231d79b14f3f6bce15eb4c8846b4acf42271e35f..e24e1f7b76d9eb337cdb5ca13633ba2fc4b0ee8f 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -109,6 +109,9 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\libacl))
                $(MKDIR) $(OJT)\libacl
 !      ENDIF
+!      IF (!EXIST($(OJT)\opr))
+               $(MKDIR) $(OJT)\opr
+!      ENDIF
 !      IF (!EXIST($(OJT)\roken))
                $(MKDIR) $(OJT)\roken
 !      ENDIF

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index 6ec87b5e12ebe9be392221222a9c2b76bb8e1572..3615cf81e2b24ff9180b84be7ac19795da844ecf 100644 (file)
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -50,9 +50,11 @@ RXOBJS = rx_pthread.o
 objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
         ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
 
-SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a
+SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a \
+          ${TOP_LIBDIR}/libopr.a
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a
+LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a \
+     ${TOP_LIBDIR}/libopr.a
 
 all: dafileserver state_analyzer
 

diff --git a/src/dviced/NTMakefile b/src/dviced/NTMakefile
index a428617fa81d7492510e0772bdb8115b98b08423..9dcf58d9a2c5add98404348dd4589b163cb7ab8e 100644 (file)
--- a/src/dviced/NTMakefile
+++ b/src/dviced/NTMakefile
@@ -79,6 +79,7 @@ EXELIBS = \
         $(DESTDIR)\lib\afs\daafsvol.lib \
         $(DESTDIR)\lib\afs\mtafsvldb.lib \
        $(DESTDIR)\lib\afspthread.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 $(EXEFILE): $(EXEOBJS) $(EXELIBS)

diff --git a/src/dvolser/NTMakefile b/src/dvolser/NTMakefile
index 477cad286b2286eee2a75cbbb7c9ec788597da7f..f4e194bc96cb2b10aa92c2b6766149bd2c4ce6aa 100644 (file)
--- a/src/dvolser/NTMakefile
+++ b/src/dvolser/NTMakefile
@@ -91,6 +91,7 @@ VOLSERVER_EXELIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\mtafsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afspthread.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in
index 5cab03a8b84facc80a80c988304ccac9fc2505b7..c15415a3ab7a628de7472393f3d7e2766ebabaae 100644 (file)
--- a/src/finale/Makefile.in
+++ b/src/finale/Makefile.in
@@ -39,6 +39,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libprot.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${XLIBS}
 
 all: translate_et

diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in
index e7cd34d3345c84730ade67bd5ead3ca17cb21718..6b1b9e7df8b8b3a73e5644a6905ed067ba24fa02 100644 (file)
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@@ -25,8 +25,8 @@ LIBS=${TOP_LIBDIR}/libvolser.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libsys.a \
-       ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-       ${TOP_LIBDIR}/util.a
+       ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libopr.a \
+       ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 all: ${TOP_INCDIR}/afs/fsprobe.h ${TOP_LIBDIR}/libfsprobe.a fsprobe_test
 

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index ead1d26d8ed90022720aa259b36f7175a324a43a..ebd615913df6fc7d3f02e9c5019f5860e7be9974 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -31,6 +31,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafsutil.a \
+       ${TOP_LIBDIR}/libopr.a \
        $(DBM) \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
@@ -48,6 +49,7 @@ KLIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafsutil.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o katoken.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o

diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile
index 7a6c556cee0f558b02203a33a3be32f50a6c0e06..a1efbd94d418164ffac2ebe7e76121133192b0d6 100644 (file)
--- a/src/kauth/NTMakefile
+++ b/src/kauth/NTMakefile
@@ -93,6 +93,7 @@ AFSLIBS =  \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afsrxkad.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
        

diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c
index 6509b32aa2928358a8199237f5d43ae23d1efcb6..f65c9aedf54d06428c30aff16056b80333a777dc 100644 (file)
--- a/src/kauth/admin_tools.c
+++ b/src/kauth/admin_tools.c
@@ -17,6 +17,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <ctype.h>
 

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 70237a699a525a2ffd74e5440277eba88575d9b3..652996c6d762c18c43088c7447a178e0afbde733 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -14,6 +14,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wstrict-prototypes"

diff --git a/src/kauth/client.c b/src/kauth/client.c
index 7f5015cf15e6f74f6172070b3356891016b422fe..4bc8a9217fc48bf9d6afc8f32b69c4698fd76e00 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <hcrypto/des.h>
 #include <hcrypto/ui.h>

diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c
index 68d11b4998dc3b1808dc2fdbf8f475deda25ba68..c152db7c3b2e42ae4d81c71c2d85bc4e3d163fa8 100644 (file)
--- a/src/kauth/kalocalcell.c
+++ b/src/kauth/kalocalcell.c
@@ -11,6 +11,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <afs/pthread_glock.h>
 #include <afs/cellconfig.h>

diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c
index 5da46efbd2e16da85e9b9c91222f70a34ec91365..9d2d04e28632b3f4dfe0daea10a1ef7b7c9713ea 100644 (file)
--- a/src/kauth/kaprocs.c
+++ b/src/kauth/kaprocs.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 # include <sys/resource.h>

diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index df5a485c9aecd14d6f410b15a9493b71aa47ec7e..4868ba0b3960a046d675fad862dc01efcbf9b269 100644 (file)
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>

diff --git a/src/kauth/katoken.c b/src/kauth/katoken.c
index 71521b0ab45b7f2395a6b693c06047c62eacfe6c..0387a102c18ddccb1fce42cd4c368abe8d886da9 100644 (file)
--- a/src/kauth/katoken.c
+++ b/src/kauth/katoken.c
@@ -16,6 +16,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef UKERNEL
 # include "afsincludes.h"

diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c
index 031f8953d374de11b0a16ebd0be2c3e776d5d08a..0ea59154691effacaacddcd94bd948770217e383 100644 (file)
--- a/src/kauth/kpasswd.c
+++ b/src/kauth/kpasswd.c
@@ -13,6 +13,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <limits.h>
 

diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c
index 9bd3eae5210f5bbccf52e36b19093d8512e79845..ce1b2ebd9f2594df57cf33b50354de49e3a15ff0 100644 (file)
--- a/src/kauth/krb_tf.c
+++ b/src/kauth/krb_tf.c
@@ -48,6 +48,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <rx/xdr.h>
 #include <afs/auth.h>

diff --git a/src/libadmin/adminutil/NTMakefile b/src/libadmin/adminutil/NTMakefile
index 776d78d874f7e7759630352bbbff8bf28cea2bdc..610893f1406c23bc7071711edb5c24cda707ee7f 100644 (file)
--- a/src/libadmin/adminutil/NTMakefile
+++ b/src/libadmin/adminutil/NTMakefile
@@ -141,6 +141,7 @@ DLLLIBS =\
         $(DESTDIR)\lib\afs\afsutil.lib \
        $(DESTDIR)\lib\afsauthent.lib \
         $(DESTDIR)\lib\afs\afsreg.lib \
+       $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\afsroken.lib
 
 !IF "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" || "$(CPU)" == "ALPHA64"

diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile
index 195f55ee6c467859dd15396d76600320ff8da739..684c6aec6e9227fa6ecd52628165f07bd477d861 100644 (file)
--- a/src/libafsauthent/NTMakefile
+++ b/src/libafsauthent/NTMakefile
@@ -69,7 +69,6 @@ UBIKOBJS = \
 UTILOBJS = \
        $(OUT)\pthread_glock.obj \
        $(OUT)\get_krbrlm.obj \
-       $(OUT)\casestrcpy.obj \
        $(OUT)\fileutil.obj \
        $(OUT)\dirpath.obj \
        $(OUT)\readdir_nt.obj
@@ -147,6 +146,7 @@ DLLLIBS =\
         $(DESTDIR)\lib\afslwp.lib \
         $(DESTDIR)\lib\lanahelper.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index dab6a444833b9b1a43e8690e9a7c4cf80218b980..1082f429cbff8652ea305d3561d0db476bfa2199 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -25,6 +25,7 @@ RXSTAT = ${srcdir}/../rxstat
 FSINT = ${srcdir}/../fsint
 COMERR = ${srcdir}/../comerr
 UTIL = ${srcdir}/../util
+OPR = $(srcdir)/../opr
 SYS = ${srcdir}/../sys
 LWP = ${srcdir}/../lwp
 
@@ -259,8 +260,8 @@ com_err.o: ${COMERR}/com_err.c
        $(AFS_CCRULE) $(COMERR)/com_err.c
 
 
-casestrcpy.o: ${UTIL}/casestrcpy.c
-       $(AFS_CCRULE) $(UTIL)/casestrcpy.c
+casestrcpy.o: ${OPR}/casestrcpy.c
+       $(AFS_CCRULE) $(OPR)/casestrcpy.c
 
 assert.o: ${UTIL}/assert.c
        $(AFS_CCRULE) $(UTIL)/assert.c

diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile
index 74f2657f93acf69c411b6034351e373e468c1dba..18161d30289db5723e2062336ae847ad158f187d 100644 (file)
--- a/src/libafsrpc/NTMakefile
+++ b/src/libafsrpc/NTMakefile
@@ -46,7 +46,7 @@ LIBRXKAD_OBJS = $(OUT)\rxkad_client.obj $(OUT)\rxkad_server.obj $(OUT)\rxkad_com
 
 LIBRXKAD_REGOBJS = $(OUT)\bg-fcrypt.obj
 
-UTILOBJS = $(OUT)\casestrcpy.obj $(OUT)\winsock_nt.obj
+UTILOBJS = $(OUT)\winsock_nt.obj
 
 COMERRBJS = $(OUT)\error_msg.obj $(OUT)\et_name.obj $(OUT)\com_err.obj
 
@@ -91,6 +91,7 @@ DLLLIBS =\
 !ENDIF
        $(DESTDIR)\lib\afs\afsutil.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index e6a382fe2374f23e10abc50b08b08599d351c542..72e2aef77fc6e18d83c80ffe7a84cd5e4d9b3e97 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -1082,7 +1082,7 @@ $(UOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
 $(UOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE1)
-$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
 $(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
@@ -1379,7 +1379,7 @@ $(PICOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULEPIC)
 $(PICOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULEPIC)
-$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULEPIC)
 $(PICOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULEPIC)
@@ -1685,7 +1685,7 @@ $(WEBOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE2)
 $(WEBOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE2)
-$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
 $(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
@@ -1977,7 +1977,7 @@ $(JUAFS)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
 $(JUAFS)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE1)
-$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
 $(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)

diff --git a/src/log/Makefile.in b/src/log/Makefile.in
index 0a7b61347aca8476d0da6c58281d10a8d63803b8..c70f7ccf85c3c3f6746906ee4449ea220f538425 100644 (file)
--- a/src/log/Makefile.in
+++ b/src/log/Makefile.in
@@ -21,15 +21,16 @@ LIBRARIES=${TOP_LIBDIR}/libauth.a \
                ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \
                ${TOP_LIBDIR}/libsys.a \
                ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
-               ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-               ${TOP_LIBDIR}/util.a
+               ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libopr.a \
+               ${TOP_LIBDIR}/libafshcrypto_lwp.a
+
 KLIBRARIES=${TOP_LIBDIR}/libauth.krb.a \
                ${TOP_LIBDIR}/librxkad.a \
                ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \
                ${TOP_LIBDIR}/libsys.a \
                ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
-               ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-               ${TOP_LIBDIR}/util.a
+               ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libopr.a \
+               ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 #
 # Main targets

diff --git a/src/log/unlog.c b/src/log/unlog.c
index 929ab3016cff5ee4831ba8919fa26e5fa7b09742..9e39ce6cf68aa91a6ff191a3580f2a9db8424b03 100644 (file)
--- a/src/log/unlog.c
+++ b/src/log/unlog.c
@@ -30,6 +30,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <afs/vice.h>
 

diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in
new file mode 100644 (file)
index 0000000..d339cfc
--- /dev/null
+++ b/src/opr/Makefile.in
@@ -0,0 +1,25 @@
+srcdir=@srcdir@
+include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.pthread
+
+objects = casestrcpy.o
+
+all: $(TOP_INCDIR)/afs/opr.h $(TOP_LIBDIR)/libopr.a
+
+libopr.a: $(objects)
+       -$(RM) -f $@
+       $(AR) crv $@ $(objects)
+       $(RANLIB) $@
+
+$(TOP_LIBDIR)/libopr.a: libopr.a
+       $(INSTALL_DATA) libopr.a $@
+
+$(TOP_INCDIR)/afs/opr.h: opr.h
+       $(INSTALL_DATA) opr.h $@
+
+install: libopr.a
+       $(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a
+
+dest: libopr.a
+       $(INSTALL_DATA) libopr.a $(DEST)/lib/libopr.a
+

diff --git a/src/opr/NTMakefile b/src/opr/NTMakefile
new file mode 100644 (file)
index 0000000..6784827
--- /dev/null
+++ b/src/opr/NTMakefile
@@ -0,0 +1,37 @@
+# Copyright 2011, Your File System Inc
+# All rights reserved
+#
+# This software has been released under the terms of the BSD License
+# For details, see the LICENSE file in the top level source directory
+
+RELDIR=opr
+!include ..\config\NTMakefile.$(SYS_NAME)
+!include ..\config\NTMakefile.version
+
+INCFILEDIR = $(DESTDIR)\include\afs
+
+INCFILES = \
+       $(INCFILEDIR)\opr.h
+
+LIBFILE = $(DESTDIR)\lib\opr.lib
+
+LIBOBJS = \
+       $(OUT)\casestrcpy.obj \
+       $(OUT)\AFS_component_version_number.obj
+
+$(LIBOBJS): $(INCFILES)
+
+!if !defined(NMAKE)
+NTMAKE = nmake /nologo /f ntmakefile
+!endif
+
+$(LIBFILE): $(LIBOBJS)
+       $(LIBARCH)
+
+install_headers: $(INCFILES)
+
+install: install_headers $(LIBFILE)
+
+clean::
+       $(DEL) $(INCFILES)
+       $(DEL) $(LIBFILE)

diff --git a/src/opr/casestrcpy.c b/src/opr/casestrcpy.c
new file mode 100644 (file)
index 0000000..7f80ded
--- /dev/null
+++ b/src/opr/casestrcpy.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ *
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
+
+#include <ctype.h>
+
+#include <afs/opr.h>
+
+/* Just like strncpy but shift-case in transit and forces null termination */
+char *
+lcstring(char *d, char *s, int n)
+{
+    char *original_d = d;
+    char c;
+
+    if ((s == 0) || (d == 0))
+       return 0;               /* just to be safe */
+    while (n) {
+       c = *s++;
+       if (isupper(c))
+           c = tolower(c);
+       *d++ = c;
+       if (c == 0)
+           break;              /* quit after transferring null */
+       if (--n == 0)
+           *(d - 1) = 0;       /* make sure null terminated */
+    }
+    return original_d;
+}
+
+char *
+ucstring(char *d, char *s, int n)
+{
+    char *original_d = d;
+    char c;
+
+    if ((s == 0) || (d == 0))
+       return 0;
+    while (n) {
+       c = *s++;
+       if (islower(c))
+           c = toupper(c);
+       *d++ = c;
+       if (c == 0)
+           break;
+       if (--n == 0)
+           *(d - 1) = 0;       /* make sure null terminated */
+    }
+    return original_d;
+}
+
+void
+stolower(char *s)
+{
+  while (*s) {
+        if (isupper(*s))
+            *s = tolower(*s);
+        s++;
+    }
+    return;
+}
+
+void
+stoupper(char *s)
+{
+  while (*s) {
+        if (islower(*s))
+            *s = toupper(*s);
+        s++;
+    }
+    return;
+}
+
+/* strcompose - concatenate strings passed to it.
+ * Input:
+ *   buf: storage for the composed string. Any data in it will be lost.
+ *   len: length of the buffer.
+ *   ...: variable number of string arguments. The last argument must be
+ *        NULL.
+ * Returns buf or NULL if the buffer was not sufficiently large.
+ */
+char *
+strcompose(char *buf, size_t len, ...)
+{
+    va_list ap;
+    size_t spaceleft = len - 1;
+    char *str;
+    size_t slen;
+
+    if (buf == NULL || len <= 0)
+       return NULL;
+
+    *buf = '\0';
+    va_start(ap, len);
+    str = va_arg(ap, char *);
+    while (str) {
+       slen = strlen(str);
+       if (spaceleft < slen)   /* not enough space left */
+           return NULL;
+
+       strcat(buf, str);
+       spaceleft -= slen;
+
+       str = va_arg(ap, char *);
+    }
+    va_end(ap);
+
+    return buf;
+}

diff --git a/src/opr/opr.h b/src/opr/opr.h
new file mode 100644 (file)
index 0000000..dacc703
--- /dev/null
+++ b/src/opr/opr.h
@@ -0,0 +1,18 @@
+#ifndef OPENAFS_OPR_OPR_H
+#define OPENAFS_OPR_OPR_H 1
+
+/* casestrcpy.c */
+
+#define lcstring opr_lcstring
+#define ucstring opr_ucstring
+#define stolower opr_stolower
+#define stoupper opr_stoupper
+#define strcompose opr_strcompose
+
+extern char *opr_lcstring(char *d, char *s, int n);
+extern char *opr_ucstring(char *d, char *s, int n);
+extern void opr_stolower(char *s);
+extern void opr_stoupper(char *s);
+extern char *opr_strcompose(char *buf, size_t len, ...);
+
+#endif

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 811630bf545b996e86eee09caa4fa26f3a79afaa..c40c11d100ca4f8d58816a85780eed8a49b7facb 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -38,6 +38,7 @@ LIBS=   ${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libafsutil.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 

diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile
index e571c0e8c2461e1225c51e875685ea516ecb44c2..d6180bb91e7df5154dcf5ebb911547bb7ebb3c3c 100644 (file)
--- a/src/ptserver/NTMakefile
+++ b/src/ptserver/NTMakefile
@@ -71,6 +71,7 @@ PTSERVER_EXELIBS =\
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\libafsconf.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 
@@ -123,6 +124,7 @@ PTS_EXELIBS =\
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\afspioctl.lib \
        $(DESTDIR)\lib\libafsconf.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c
index efae5c3a5daa4f137fb2261895ad2c9a427d3e6e..2ed47ed51897287f9cb90e19bf6799088c03c64e 100644 (file)
--- a/src/ptserver/ptclient.c
+++ b/src/ptserver/ptclient.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>

diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c
index 570a0bdb32661d9bc7411e9c59ac9524007577ef..35a844d88053051f6fd99fa2dd6cb80feec28ffb 100644 (file)
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -52,6 +52,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <ctype.h>
 

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index bbf735f2285aa1720c7712588227bb5b67e11cb6..a5c5009b20a6409617e566f1fa66abde292679fa 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -113,6 +113,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index 63e57303a1b1695febea64ab261c09eecb58235d..29114cdbc93f6e3a77ce6569293ee64697db8eac 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -12,6 +12,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <rx/rx.h>
 #include <rx/xdr.h>

diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c
index c48d135deeff2d50fdee4f47193511b36c6afa06..a4904f90ecd7c11364777bf5c978e3f2379bac52 100644 (file)
--- a/src/ptserver/readgroup.c
+++ b/src/ptserver/readgroup.c
@@ -11,6 +11,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>

diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c
index 1b28245fd3ec9aa668adb9897a3593cf2b478a1a..cf8a68f4bff065d70404bacd67816391a4875c99 100644 (file)
--- a/src/ptserver/testpt.c
+++ b/src/ptserver/testpt.c
@@ -11,6 +11,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <ctype.h>
 #include <math.h>

diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index 820797658fe8bb90b5c50131b3907ead78bc0a62..8bf91e4baed9dabf02e77e827fb141476c80dfa6 100644 (file)
--- a/src/rx/rx_pthread.c
+++ b/src/rx/rx_pthread.c
@@ -19,6 +19,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <assert.h>
 

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 7f0b5fa1a076fb92b1c3771ef7a1a97152ba4c67..4e574287171125e7393e050ee71e94356a372cd9 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -16,6 +16,8 @@
 
 #include <roken.h>
 
+#include <afs/opr.h>
+
 #ifdef AFS_NT40_ENV
 # include <WINNT/syscfg.h>
 #else

diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in
index 401de74f632eb81a2ad26f4b641fc89a6d0dff19..53e8b2db34dfda07989b9b5b17092acefac5bff6 100644 (file)
--- a/src/scout/Makefile.in
+++ b/src/scout/Makefile.in
@@ -41,8 +41,9 @@ LIBS=${TOP_LIBDIR}/libgtx.a \
        ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-       ${TOP_LIBDIR}/util.a
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a \
+       ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 all: scout
 

diff --git a/src/shlibafsauthent/NTMakefile b/src/shlibafsauthent/NTMakefile
index d1ab06c8f19d88e6756bafaf9e950ab5996aaba5..fedb2f515381f4edfc512681b7d7f614c2338b27 100644 (file)
--- a/src/shlibafsauthent/NTMakefile
+++ b/src/shlibafsauthent/NTMakefile
@@ -57,7 +57,6 @@ UBIKOBJS = \
 UTILOBJS = \
        $(OUT)\pthread_glock.obj \
        $(OUT)\get_krbrlm.obj \
-       $(OUT)\casestrcpy.obj \
        $(OUT)\fileutil.obj \
        $(OUT)\dirpath.obj \
        $(OUT)\readdir_nt.obj
@@ -171,9 +170,6 @@ fileutil.obj: $(UTIL)\fileutil.c
 readdir_nt.obj: $(UTIL)\readdir_nt.c
        $(C2OBJ) $(UTIL)\readdir_nt.c
 
-casestrcpy.obj: $(UTIL)\casestrcpy.c
-       $(C2OBJ) $(UTIL)\casestrcpy.c
-
 pthread_glock.obj: $(UTIL)\pthread_glock.c
        $(C2OBJ) $(UTIL)\pthread_glock.c
 

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index f51ff6616505e0b0df384d38dc162315628d4976..a0a7403e1e8248bd8ee4e90c29f002a4f2a46130 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -29,6 +29,7 @@ RXSTAT = $(srcdir)/../rxstat
 FSINT = $(srcdir)/../fsint
 COMERR = $(srcdir)/../comerr
 UTIL = $(srcdir)/../util
+OPR = $(srcdir)/../opr
 SYS = ${srcdir}/../sys
 LWP = ${srcdir}/../lwp
 
@@ -270,8 +271,8 @@ et_name.o: ${COMERR}/et_name.c
 com_err.o: ${COMERR}/com_err.c
        $(AFS_CCRULE) $(COMERR)/com_err.c
 
-casestrcpy.o: ${UTIL}/casestrcpy.c
-       $(AFS_CCRULE) $(UTIL)/casestrcpy.c
+casestrcpy.o: ${OPR}/casestrcpy.c
+       $(AFS_CCRULE) $(OPR)/casestrcpy.c
 
 assert.o: ${UTIL}/assert.c
        $(AFS_CCRULE) $(UTIL)/assert.c

diff --git a/src/shlibafsrpc/libafsrpc.map b/src/shlibafsrpc/libafsrpc.map
index ce468e48a28fe3679ab40f72095cccf29192ec4e..41670549a17a13c60e9f2491004e0088bda5ab25 100755 (executable)
--- a/src/shlibafsrpc/libafsrpc.map
+++ b/src/shlibafsrpc/libafsrpc.map
@@ -109,10 +109,10 @@
        RXSTATS_ClearPeerRPCStats;
        TM_GetTimeOfDay;
        FT_GetTimeOfDay;
-       strcompose;
-       stolower;
-       ucstring;
-       lcstring;
+       opr_strcompose;
+       opr_stolower;
+       opr_ucstring;
+       opr_lcstring;
        AssertionFailed;
        rx_GetLocalPeers;
        rx_GetMaxReceiveWindow;

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index ee64977eb9ebac8486ab8330d42e2b8d6caa6ed0..8161579e22bc751889a0d52a6f6163a51638962a 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -17,7 +17,8 @@ LIBS=libsys.a \
      ${TOP_LIBDIR}/librx.a \
      libsys.a \
      ${TOP_LIBDIR}/liblwp.a \
-     ${TOP_LIBDIR}/util.a \
+     $(TOP_LIBDIR)/libafsutil.a \
+     ${TOP_LIBDIR}/libopr.a \
      ${TOP_LIBDIR}/libafshcrypto_lwp.a \
      ${XLIBS}
 

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 3d362c6abf94dda4f3114f94fc2d034f57883760..4eb24e2ad2b7b2f879345eaf265c34035136564e 100644 (file)
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -81,6 +81,7 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
             $(DESTDIR)\lib\afspthread.lib \
              $(DESTDIR)\lib\afsauthent.lib \
             $(DESTDIR)\lib\libafsconf.lib \
+            $(DESTDIR)\lib\opr.lib \
             $(DESTDIR)\lib\afshcrypto.lib \
             $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 72a74dc3964dd3abdde5fd550c442df743208899..b4346df0dec5b9a4930890587d5612e774f42f5c 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -53,7 +53,8 @@ SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIR
 LIBS=   ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/util.a \
-       ${TOP_LIBDIR}/libcmd.a
+       ${TOP_LIBDIR}/libcmd.a \
+       ${TOP_LIBDIR}/libopr.a
 
 SLIBS= ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libdir.a \
@@ -61,7 +62,8 @@ SLIBS=        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libacl.a \
-       ${TOP_LIBDIR}/util.a
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a 
 
 all: salvageserver dafssync-debug salvsync-debug dasalvager
 

diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
index 6b92a3c175df8303273adc439109b80140618761..a8f72bb38d040690c38d602a1d17c08c1a000de2 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -24,6 +24,7 @@ AFSLIBS = \
                ${TOP_LIBDIR}/libcmd.a \
                ${TOP_LIBDIR}/libafscom_err.a \
                ${TOP_LIBDIR}/util.a \
+               ${TOP_LIBDIR}/libopr.a \
                ${TOP_LIBDIR}/libaudit.a
 
 KAFSLIBS = \
@@ -39,6 +40,7 @@ KAFSLIBS = \
                ${TOP_LIBDIR}/libcmd.a \
                ${TOP_LIBDIR}/libafscom_err.a \
                ${TOP_LIBDIR}/util.a \
+               ${TOP_LIBDIR}/libopr.a \
                ${TOP_LIBDIR}/libaudit.a
 
 AUTH_OBJS = \

diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile
index d1375b7a3e76f479476edd7717dcdef5a8b2afcb..55733829834e1ba193a5fa017c8c9bbc66db7ab9 100644 (file)
--- a/src/tviced/NTMakefile
+++ b/src/tviced/NTMakefile
@@ -81,6 +81,7 @@ EXELIBS = \
         $(DESTDIR)\lib\afs\mtafsvol.lib \
         $(DESTDIR)\lib\afs\mtafsvldb.lib \
         $(DESTDIR)\lib\afs\mtafsdir.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afspthread.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/tvolser/NTMakefile b/src/tvolser/NTMakefile
index cd9906e32f2c39583d1a5f47b9e50a8d150b380a..6a0262d5c33fcc595517a1f2d243ca9a501f08f7 100644 (file)
--- a/src/tvolser/NTMakefile
+++ b/src/tvolser/NTMakefile
@@ -93,6 +93,7 @@ VOLSERVER_EXELIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\mtafsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afspthread.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 0076623879bbed65d05cb6473b49aad9a967124c..b1b435804b34f9ee201da8a32b6a608b838ea0fc 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -20,7 +20,8 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 
 LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
      ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
-     ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
+     ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libopr.a \
+     $(TOP_LIBDIR)/libafsutil.a ${XLIBS}
 
 all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client
 

diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile
index 05170c3de8b53234cb25ed3f65f353b6a108eb73..d1ccf56fc36b9e2d47ba2f448a86ed9938324c58 100644 (file)
--- a/src/ubik/NTMakefile
+++ b/src/ubik/NTMakefile
@@ -136,6 +136,7 @@ UDBG_EXELIBS =\
        $(DESTDIR)\lib\afs\afscom_err.lib \
        $(DESTDIR)\lib\afs\afscmd.lib \
        $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 

diff --git a/src/update/Makefile.in b/src/update/Makefile.in
index e7b52a299f0a9540ea99c540d4743c7add988d3f..96fb5d1e37c72e52393768c878a2863e90be427b 100644 (file)
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@@ -17,8 +17,9 @@ LIBS=${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libafscom_err.a \
-       ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-       ${TOP_LIBDIR}/util.a
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a \
+       ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 all: upserver upclient
 

diff --git a/src/update/NTMakefile b/src/update/NTMakefile
index a1529ed7722adf38fd8ae6424d96e8fd627eeb4d..baf6e1486bf6a43c958d14e2a14add7e256bd4eb 100644 (file)
--- a/src/update/NTMakefile
+++ b/src/update/NTMakefile
@@ -23,6 +23,7 @@ LIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\libafsconf.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/update/client.c b/src/update/client.c
index d63a3d343ed2b80c4d911200b872b1b3409a3b73..a9be509a74c9a906b8d64f31d07fc6821a40d480 100644 (file)
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -13,6 +13,7 @@
 
 #include <afs/procmgmt.h>
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>

diff --git a/src/update/server.c b/src/update/server.c
index e4846a5ee0441e53ef29d7d151993d52772e4f4a..bd0c7c13ebaef5737d4abe3c6b51f0f5dcd2daf7 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -13,6 +13,7 @@
 
 #include <afs/procmgmt.h>
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>

diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index 5076b66149bb45dfd77b10698d03079448f92091..0fe78676d29df85bbd02d1ea79570cbe9ffa4c09 100644 (file)
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -29,6 +29,7 @@ LIBS=${TOP_LIBDIR}/libvolser.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 OBJS =  uss_procs.o \

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 80ae6918f27708d5a2b24958a79f9a2003c2a3aa..9c1b17c677df601dd4c1de5d2ba94ca725ef7ece 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -12,7 +12,7 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp
 HELPER_SPLINT=@HELPER_SPLINT@
 
 
-objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
+objects =assert.o base64.o config_file.o ktime.o volparse.o \
         hostparse.o exec.o \
         hputil.o kreltime.o get_krbrlm.o uuid.o serverLog.o \
         dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
@@ -22,7 +22,6 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
 objects_pic = \
        assert_pic.o \
        base64_pic.o \
-       casestrcpy_pic.o \
        config_file_pic.o \
        ktime_pic.o \
        volparse_pic.o \
@@ -203,9 +202,6 @@ assert_pic.o: ${srcdir}/assert.c ${includes}
 base64_pic.o: ${srcdir}/base64.c ${includes}
        $(SHD_CCRULE) ${srcdir}/base64.c
 
-casestrcpy_pic.o: ${srcdir}/casestrcpy.c ${includes}
-       $(SHD_CCRULE) ${srcdir}/casestrcpy.c
-
 config_file_pic.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h
        $(SHD_CCRULE) ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c
 
@@ -346,7 +342,7 @@ include ../config/Makefile.version
 
 check-splint:
        sh $(HELPER_SPLINT) $(CFLAGS) \
-           assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \
+           base64.c ktime.c volparse.c hostparse.c \
            hputil.c kreltime.c get_krbrlm.c uuid.c serverLog.c \
            dirpath.c fileutil.c netutils.c flipbase64.c \
            afs_atomlist.c afs_lhash.c fstab.c

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 514fb226de830146279f7385000c39e1fd254c65..9285da87ba45415c0c3081f7e0cb9a15bcadca06 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -45,7 +45,6 @@ MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
 LIBOBJS = \
        $(OUT)\assert.obj \
        $(OUT)\base32.obj \
-       $(OUT)\casestrcpy.obj \
        $(OUT)\get_krbrlm.obj \
        $(OUT)\hostparse.obj \
         $(OUT)\krb5_nt.obj \
@@ -66,7 +65,6 @@ LIBOBJS = \
 MT_LIBOBJS = \
        $(OUT)\assert.obj \
        $(OUT)\base32.obj \
-       $(OUT)\casestrcpy.obj \
        $(OUT)\get_krbrlm.obj \
        $(OUT)\hostparse.obj \
         $(OUT)\krb5_nt.obj \

diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h
index 58c7b6acc66a452afddc7931613e15ccd05117b2..25f92cb78a009237073a971b85897c6f6ad8272b 100644 (file)
--- a/src/util/afsutil_prototypes.h
+++ b/src/util/afsutil_prototypes.h
@@ -32,13 +32,6 @@ extern int base32_to_int(char *s);
 extern char *int_to_base64(b64_string_t s, int a);
 extern int base64_to_int(char *s);
 
-/* casestrcpy.c */
-extern char *lcstring(char *d, char *s, int n);
-extern char *ucstring(char *d, char *s, int n);
-extern char *strcompose(char *buf, size_t len, ...);
-extern void stolower(char *s);
-extern void stoupper(char *s);
-
 /* config_file.c && krb5_locl.h */
 typedef struct afs_config_section_struct afs_config_section;
 extern int afs_config_parse_file_multi(const char *, afs_config_section **);

diff --git a/src/util/casestrcpy.c b/src/util/casestrcpy.c
deleted file mode 100644 (file)
index 606a898..0000000
--- a/src/util/casestrcpy.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2000, International Business Machines Corporation and others.
- * All Rights Reserved.
- *
- * This software has been released under the terms of the IBM Public
- * License.  For details, see the LICENSE file in the top-level source
- * directory or online at http://www.openafs.org/dl/license10.html
- */
-
-#include <afsconfig.h>
-#include <afs/param.h>
-
-#include <roken.h>
-
-#include <ctype.h>
-
-/* Just like strncpy but shift-case in transit and forces null termination */
-char *
-lcstring(char *d, char *s, int n)
-{
-    char *original_d = d;
-    char c;
-
-    if ((s == 0) || (d == 0))
-       return 0;               /* just to be safe */
-    while (n) {
-       c = *s++;
-       if (isupper(c))
-           c = tolower(c);
-       *d++ = c;
-       if (c == 0)
-           break;              /* quit after transferring null */
-       if (--n == 0)
-           *(d - 1) = 0;       /* make sure null terminated */
-    }
-    return original_d;
-}
-
-char *
-ucstring(char *d, char *s, int n)
-{
-    char *original_d = d;
-    char c;
-
-    if ((s == 0) || (d == 0))
-       return 0;
-    while (n) {
-       c = *s++;
-       if (islower(c))
-           c = toupper(c);
-       *d++ = c;
-       if (c == 0)
-           break;
-       if (--n == 0)
-           *(d - 1) = 0;       /* make sure null terminated */
-    }
-    return original_d;
-}
-
-void
-stolower(char *s)
-{
-  while (*s) {
-        if (isupper(*s))
-            *s = tolower(*s);
-        s++;
-    }
-    return;
-}
-
-void
-stoupper(char *s)
-{
-  while (*s) {
-        if (islower(*s))
-            *s = toupper(*s);
-        s++;
-    }
-    return;
-}
-
-/* strcompose - concatenate strings passed to it.
- * Input:
- *   buf: storage for the composed string. Any data in it will be lost.
- *   len: length of the buffer.
- *   ...: variable number of string arguments. The last argument must be
- *        NULL.
- * Returns buf or NULL if the buffer was not sufficiently large.
- */
-char *
-strcompose(char *buf, size_t len, ...)
-{
-    va_list ap;
-    size_t spaceleft = len - 1;
-    char *str;
-    size_t slen;
-
-    if (buf == NULL || len <= 0)
-       return NULL;
-
-    *buf = '\0';
-    va_start(ap, len);
-    str = va_arg(ap, char *);
-    while (str) {
-       slen = strlen(str);
-       if (spaceleft < slen)   /* not enough space left */
-           return NULL;
-
-       strcat(buf, str);
-       spaceleft -= slen;
-
-       str = va_arg(ap, char *);
-    }
-    va_end(ap);
-
-    return buf;
-}

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index 5a1a7d3e6b0054524c6a4d5f6334e24092a5f868..dd894b015f23ca38e4c88f5d26f32a7f6c9cd6fa 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -11,6 +11,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <stddef.h>
 #include <ctype.h>

diff --git a/src/util/ktime.c b/src/util/ktime.c
index eec1f3be959ce39b3d92a6db36c4d266b4e7611a..f15ee289d7acb57191ea80caa03ca187a0c60b9b 100644 (file)
--- a/src/util/ktime.c
+++ b/src/util/ktime.c
@@ -11,6 +11,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <ctype.h>
 

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 023054ac0077d994f336b7de27517455bf353840..04d78f539227ad4d440b5014207ef741fb6a6549 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -29,7 +29,8 @@ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
        ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libcmd.a \
-       $(TOP_LIBDIR)/libafsutil.a
+       $(TOP_LIBDIR)/libafsutil.a \
+       $(TOP_LIBDIR)/libopr.a
 
 FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libvldb.a \
@@ -44,8 +45,9 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a \
         ${TOP_LIBDIR}/libaudit.a \
+        $(TOP_LIBDIR)/libafsutil.a \
+        $(TOP_LIBDIR)/libopr.a \
         ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-        $(TOP_LIBDIR)/libafsutil.a
 
 CMLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libafsint.a \
@@ -56,6 +58,7 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/librx.a \
         ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a \
+        $(TOP_LIBDIR)/libopr.a \
         $(TOP_LIBDIR)/libafsutil.a
 
 LIBS = ${FSLIBS} 
@@ -124,13 +127,14 @@ fstrace.o: fstrace.c AFS_component_version_number.c
 fstrace: fstrace.o
        case ${SYS_NAME} in \
                sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \
+                       ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a;; \
                sun*_4* ) \
-                       ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lxpg ;; \
+                       ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a -lxpg ;; \
                * ) \
                        $(AFS_LDRULE) fstrace.o ${TOP_LIBDIR}/libsys.a \
                                ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \
-                               ${XLIBS} $(LIB_roken);; \
+                               $(TOP_LIBDIR)/libopr.a ${XLIBS} \
+                               $(LIB_roken);; \
        esac
 
 cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 4391e9e9317749721e2e2553cddd9c23a62a3ad7..a8a4148c1d3fec925e01c26fa44d4b4df153b9c3 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -29,6 +29,7 @@ LIBS=${TOP_LIBDIR}/libacl.a   \
        ${TOP_LIBDIR}/libafscom_err.a   \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libafsutil.a \
+       $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 headers=${TOP_INCDIR}/lwp.h            \

diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile
index e613ad9ea0c2461f0ff69c7c90e4a73b6e481ca1..aca371376d4ac4c34c955ad40ce6da416006c724 100644 (file)
--- a/src/viced/NTMakefile
+++ b/src/viced/NTMakefile
@@ -60,6 +60,7 @@ EXELIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/viced/host.c b/src/viced/host.c
index ac9ec9c1b8858e5c6e8744665fc16a413b236804..fab7fcb95b21b4be05e628c4777e26aadef71ae8 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -14,6 +14,7 @@
 #include <afs/stds.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index e70b02f2ce999d4587fd2099f89d13d29c319825..548bc78bd82ce76ec486a4d673d8745a65bfc4aa 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -31,6 +31,7 @@ LIBS=\
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libafsutil.a \
+       $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o

diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile
index 561ee9e25d593f4c6b7710850056a75ae8e5162f..412bc193219594132f782b372a3ab888a4b26751 100644 (file)
--- a/src/vlserver/NTMakefile
+++ b/src/vlserver/NTMakefile
@@ -90,6 +90,7 @@ VLSERVER_EXECLIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\libafsconf.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 6ec97d7cde15c3359ca1f23757c1a1b61f60dfb5..fd7bf9e4acbb864aedd0e9d31322365444b615b6 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -16,7 +16,7 @@ HELPER_SPLINT=@HELPER_SPLINT@
 LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libdir.a ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libsys.a \
-       ${TOP_LIBDIR}/libacl.a
+       ${TOP_LIBDIR}/libacl.a ${TOP_LIBDIR}/libopr.a
 
 MODULE_CFLAGS= -D${SYS_NAME} ${FSINCLUDES} \
               -DFSSYNC_BUILD_SERVER -DFSSYNC_BUILD_CLIENT

diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile
index ef1340bb5a7a079f4aed77b504f11138af675573..d3605c32b07341c0d61deeff858fecf4558f845f 100644 (file)
--- a/src/vol/NTMakefile
+++ b/src/vol/NTMakefile
@@ -183,6 +183,7 @@ EXEC_LIBS = \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afspthread.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afsroken.lib
 
 ############################################################################

diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c
index 44d182440503996709eff74265ab655df8f55fe3..07094a52a339145787f82ebf82789b465f22ccd6 100644 (file)
--- a/src/vol/daemon_com.c
+++ b/src/vol/daemon_com.c
@@ -22,6 +22,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include <afs/afs_assert.h>
 #include <rx/xdr.h>

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index b8db42c89e9a4096a5223fe594c5ef3f8f99be8a..112e68a8756321a532694d6b5612b9abe94c2cee 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -39,23 +39,25 @@ LIBS=\
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libusd.a \
-       ${TOP_LIBDIR}/libafshcrypto_lwp.a \
-       ${TOP_LIBDIR}/util.a
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libopr.a \
+       ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 VOLDUMP_LIBS = \
        ../vol/ihandle.o \
        ../vol/physio.o \
        ../vol/vlib.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libdir.a \
        ${TOP_LIBDIR}/librx.a  \
        ${TOP_LIBDIR}/liblwp.a  \
        ${TOP_LIBDIR}/libsys.a  \
-       ${TOP_LIBDIR}/libacl.a
+       ${TOP_LIBDIR}/libacl.a \
+       ${TOP_LIBDIR}/util.a \
+       $(TOP_LIBDIR)/libopr.a
 
-VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
+VSOBJS=vsutils.o vsprocs.o lockprocs.o volint.xdr.o volerr.o 
 SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
  volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vol_split.o
 

diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile
index 7c42e0807a1c1f276ec3230eab0e3d9c0ce052c1..990f8cfc876cfd62b898e57e3147b7000e04c2d6 100644 (file)
--- a/src/volser/NTMakefile
+++ b/src/volser/NTMakefile
@@ -73,6 +73,7 @@ EXEC_LIBS = \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\libafsconf.lib \
         $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib