util: Add base64 from Heimdal's roken

Add the base64 code from libroken into libutil, using the src/external
framework.

Create a new, non-installed directory, to hold util headers, rather than
continuing to stuff everything into afs/

Change-Id: I6b743a3702c3bb07ac798392475e7e067765f238
Reviewed-on: http://gerrit.openafs.org/2900
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/Makefile.in b/Makefile.in
index 70a39a1725a8703e1d7101b452cdedb9171b5f72..ab92808a3c8f063868b1e90393a366e1acfc2e6b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,7 +109,8 @@ packages: dest
                echo Not building packages for ${SYS_NAME} ;; \
        esac
 
-${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto \
+    ${TOP_INCDIR}/util ${TOP_LIBDIR} ${TOP_JLIBDIR}:
        mkdir -p $@
 
 install_dirs: force
@@ -135,7 +136,8 @@ dest_dirs: force
        mkdir -p ${DEST}/root.server/etc
        mkdir -p ${DEST}/root.server/usr/afs/bin
 
-prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR}
+prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des \
+        ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/util ${TOP_LIBDIR}
 
 project: cmd comerr 
 

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 4a811364e5f0fbb2b64ed5485daac181eda281d3..aea02251dad2978e0d90bfb97c8c0da018168aa7 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -22,6 +22,7 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
         pthread_glock.o daemon.o ${REGEX_OBJ}
 
 includes = \
+       ${TOP_INCDIR}/util/base64.h \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
        ${TOP_INCDIR}/afs/assert.h \
@@ -54,6 +55,9 @@ buildtools_clean: clean
 
 depinstall: ${includes}
 
+${TOP_INCDIR}/util/base64.h: ${TOP_SRCDIR}/external/heimdal/roken/base64.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
        ${INSTALL_DATA} $? $@
 
@@ -148,6 +152,9 @@ util.a: ${objects} AFS_component_version_number.o
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
+base64.o: ${TOP_SRCDIR}/external/heimdal/roken/base64.c
+       ${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/roken/base64.c
+
 pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
        ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 3f463da96529c1254108a8ec41d91ec1f588d1d8..ee81f090756c1664ba0af729b622f11160a73d3c 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -16,6 +16,7 @@ INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 INCFILES =\
        $(INCFILEDIR)\afsutil.h \
        $(INCFILEDIR)\assert.h \
+       $(DESTDIR)\include\util\base64.h \
        $(INCFILEDIR)\dirent.h \
        $(INCFILEDIR)\errors.h \
        $(INCFILEDIR)\itc.h \
@@ -38,6 +39,9 @@ $(DESTDIR)\include\afs\dirent.h: dirent_nt.h
 $(DESTDIR)\include\afs\dirpath.h: dirpath_nt.h
        $(COPY) $** $@
 
+$(DESTDIR)\include\util\base64.h: base64.h
+       $(COPY) $** $@
+
 LIBFILE = $(DESTDIR)\lib\afs\afsutil.lib
 
 MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
@@ -45,6 +49,7 @@ MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
 LIBOBJS = \
        $(OUT)\assert.obj \
        $(OUT)\base32.obj \
+       $(OUT)\base64.obj \
        $(OUT)\casestrcpy.obj \
        $(OUT)\get_krbrlm.obj \
        $(OUT)\hostparse.obj \
@@ -71,6 +76,7 @@ LIBOBJS = \
 MT_LIBOBJS = \
        $(OUT)\assert.obj \
        $(OUT)\base32.obj \
+       $(OUT)\base64.obj \
        $(OUT)\casestrcpy.obj \
        $(OUT)\get_krbrlm.obj \
        $(OUT)\hostparse.obj \