Merge branch 'develop'

.travis.yml

@@ -6,7 +6,7 @@ notifications:
   recipients:
     - [email protected]
 
-before_install:
+before_script:
   - git clone git://github.com/Juniper/libslax.git
   - ( cd libslax && uname -a && /bin/sh ./bin/setup.sh && cd build && ../configure && make && sudo make install )
 

bin/Zaliases

@@ -1,22 +1,22 @@
 set top_src=`pwd`
 setenv LIBJUISE $top_src
-alias Zautoreconf "(cd $top_src ; autoreconf)"
+alias Zautoreconf "(cd $top_src ; autoreconf --install)"
 
 set opts=' \
 --enable-clira \
 --enable-debug  \
 --enable-warnings \
 --enable-readline \
 --enable-printflike \
---prefix /Users/phil/work/root \
---with-libxml-prefix=/Users/phil/work/root \
---with-libxslt-prefix=/Users/phil/work/root \
---with-libslax-prefix=/Users/phil/work/root \
---with-lighttpd-obj=/Users/phil/work/slax/lighttpd-for-juise/build \
---with-lighttpd-src=/Users/phil/work/slax/lighttpd-for-juise \
---with-ssh2=/Users/phil/work/root \
+--prefix $HOME/work/root \
+--with-libxml-prefix=$HOME/work/root \
+--with-libxslt-prefix=$HOME/work/root \
+--with-libslax-prefix=$HOME/work/root \
+--with-lighttpd-obj=$HOME/work/slax/lighttpd-for-juise/build \
+--with-lighttpd-src=$HOME/work/slax/lighttpd-for-juise \
+--with-ssh2=$HOME/work/root \
 --with-sqlite3=/opt/local \
---with-lighttpd-lib=/Users/phil/work/root/lib \
+--with-lighttpd-lib=$HOME/work/root/lib \
 '
 set opts=`echo $opts`
 
@@ -33,4 +33,4 @@ cd build
 alias mixer-local ./mixer/mixer --no-fork -K --verbose --local-console --server
 
 alias mm 'make CFLAGS="-O0 -g"'
-alias mmi 'mm && mmi'
+alias mmi 'mm && make install'

configure.ac

@@ -33,7 +33,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 #
 LIBXML_REQUIRED_VERSION=2.7.7
 LIBXSLT_REQUIRED_VERSION=1.1.26
-LIBSLAX_REQUIRED_VERSION=0.18.0
+LIBSLAX_REQUIRED_VERSION=0.22.0
 
 AC_PROG_CC
 AM_PROG_AR

juise-askpass/juise-askpass.c

@@ -22,6 +22,8 @@
 #include <sys/uio.h>
 
 #include "juiseconfig.h"
+#include <libpsu/psucommon.h>
+#include <libpsu/psustring.h>
 #include <libjuise/string/strextra.h>
 #include <libjuise/io/trace.h>
 

juise/juise.c

@@ -42,6 +42,9 @@
 #include <libslax/xmlsoft.h>
 
 #include "juiseconfig.h"
+#include <libpsu/psucommon.h>
+#include <libpsu/psustring.h>
+#include <libpsu/psulog.h>
 #include <libjuise/string/strextra.h>
 #include <libjuise/time/timestr.h>
 #include <libjuise/xml/libxml.h>

juise/server.c

@@ -37,6 +37,7 @@
 
 #include "juiseconfig.h"
 #include <libslax/slax.h>
+#include <libpsu/psustring.h>
 #include <libslax/slaxdata.h>
 
 #include <libjuise/string/strextra.h>

libjuise/Makefile.am

@@ -71,8 +71,6 @@ libjuise_la_SOURCES = \
     data/patricia.c \
     data/parse_ipaddr.c \
     string/snprintf_safe.c \
-    string/strndup.c \
-    string/strdupf.c \
     time/timestr.c \
     io/fbuf.c \
     io/jtrace.c \

libjuise/common/aux_types.h

@@ -77,33 +77,6 @@ typedef enum status_e {
 
 #define	ROUNDUP(a, size) (((a) & ((size)-1)) ? (1 + ((a) | ((size)-1))) : (a))
 
-/*
- * See const_* method below
- */
-typedef union {
-    void        *cg_vp;
-    const void  *cg_cvp;
-} const_remove_glue_t;
-
-/*
- * NOTE:
- *     This is EVIL.  The ONLY time you cast from a const is when calling some
- *     legacy function that does not require const:
- *          - you KNOW does not modify the data
- *          - you can't change
- *     That is why this is provided.  In that situation, the legacy API should
- *     have been written to accept const argument.  If you can change the 
- *     function you are calling to accept const, do THAT and DO NOT use this
- *     HACK.
- */
-static inline void *
-const_drop (const void *ptr)
-{
-    const_remove_glue_t cg;
-    cg.cg_cvp = ptr;
-    return cg.cg_vp;
-}
-
 /* Macros for min/max. */
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))