mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 06:50:12 +00:00
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>
This commit is contained in:
parent
440943e96b
commit
9c9b906c8a
@ -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 \
|
||||
|
18
NTMakefile
18
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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
############################################################################
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
############################################################################
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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@
|
||||
|
@ -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
|
||||
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <sys/utime.h>
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include <roken.h>
|
||||
|
||||
#include <afs/stds.h>
|
||||
#include <afs/opr.h>
|
||||
#include <afs/pthread_glock.h>
|
||||
#include <ctype.h>
|
||||
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <afs/pthread_glock.h>
|
||||
#include <afs/afsutil.h>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include <afs/procmgmt.h>
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <hcrypto/ui.h>
|
||||
|
||||
|
@ -12,6 +12,7 @@
|
||||
|
||||
#include <afs/procmgmt.h>
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <lwp.h>
|
||||
#include <rx/rx.h>
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
#include <roken.h>
|
||||
|
||||
#include <afs/afsutil.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include "error_table.h"
|
||||
#include "mit-sipb-cr.h"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -17,6 +17,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
|
@ -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"
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <hcrypto/des.h>
|
||||
#include <hcrypto/ui.h>
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <afs/pthread_glock.h>
|
||||
#include <afs/cellconfig.h>
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
# include <sys/resource.h>
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <WINNT/afsevent.h>
|
||||
|
@ -16,6 +16,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef UKERNEL
|
||||
# include "afsincludes.h"
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <rx/xdr.h>
|
||||
#include <afs/auth.h>
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <afs/vice.h>
|
||||
|
||||
|
25
src/opr/Makefile.in
Normal file
25
src/opr/Makefile.in
Normal file
@ -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
|
||||
|
37
src/opr/NTMakefile
Normal file
37
src/opr/NTMakefile
Normal file
@ -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)
|
@ -14,6 +14,8 @@
|
||||
|
||||
#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)
|
18
src/opr/opr.h
Normal file
18
src/opr/opr.h
Normal file
@ -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
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <WINNT/afsevent.h>
|
||||
|
@ -52,6 +52,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
|
@ -113,6 +113,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <WINNT/afsevent.h>
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <rx/rx.h>
|
||||
#include <rx/xdr.h>
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <WINNT/afsevent.h>
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <math.h>
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
|
@ -16,6 +16,8 @@
|
||||
|
||||
#include <roken.h>
|
||||
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
# include <WINNT/syscfg.h>
|
||||
#else
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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}
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 = \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include <afs/procmgmt.h>
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <WINNT/afsevent.h>
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include <afs/procmgmt.h>
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef AFS_NT40_ENV
|
||||
#include <WINNT/afsevent.h>
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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 **);
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <stddef.h>
|
||||
#include <ctype.h>
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <afs/stds.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#ifdef HAVE_SYS_FILE_H
|
||||
#include <sys/file.h>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
############################################################################
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include <afs/param.h>
|
||||
|
||||
#include <roken.h>
|
||||
#include <afs/opr.h>
|
||||
|
||||
#include <afs/afs_assert.h>
|
||||
#include <rx/xdr.h>
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user