diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index 3bda1be4fd29..000000000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2013, Juniper Networks, Inc. -# All rights reserved. -# This SOFTWARE is licensed under the LICENSE provided in the -# ../Copyright file. By downloading, installing, copying, or otherwise -# using the SOFTWARE, you agree to be bound by the terms of that -# LICENSE. - -ACLOCAL_AMFLAGS = -I m4 - -EXTRA_DIST = gt setup.sh - -GT_INSTALL_DIR = ${prefix}/bin -GT_INSTALL_FILES = gt - -install-data-hook: - @echo "Installing gt ... " - @-mkdir -p ${GT_INSTALL_DIR} - @for file in ${GT_INSTALL_FILES} ; do \ - if [ -f $$file ]; then \ - rfile=$$file ; \ - else \ - rfile=${srcdir}/$$file ; \ - fi ; \ - mdir=${GT_INSTALL_DIR}/ ; \ - mkdir -p $$mdir ; \ - cp $$rfile $$mdir/ ; \ - done - @${CHMOD} a+x ${GT_INSTALL_DIR}/gt diff --git a/bin/Zaliases b/bin/Zaliases deleted file mode 100644 index 04cdec7720b3..000000000000 --- a/bin/Zaliases +++ /dev/null @@ -1,29 +0,0 @@ -set top_src=`pwd` -alias Zautoreconf "(cd $top_src ; autoreconf)" - -set opts=' \ ---with-libslax-prefix=/Users/phil/work/root \ ---enable-debug \ ---enable-warnings \ ---enable-printflike \ ---with-gettext=/opt/local \ ---prefix ${HOME}/work/root \ -' -set opts=`echo $opts` - -setenv CONFIGURE_OPTS "$opts" -setenv ADB_PATH $top_src/build/libxo/.libs - -alias Zconfigure "(cd $top_src/build; ../configure $opts)" -alias Zbuild "(cd $top_src/build; make \!* )" -alias mi "(cd $top_src/build; make && make install); ." - -mkdir -p build -cd build - - -alias xx 'cc -I.. -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Werror -Waggregate-return -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wnested-externs -Wparentheses -Wreturn-type -Wshadow -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -fno-inline-functions-called-once -g -O2 -o xtest -DUNIT_TEST libxo.c' - -alias mm "make CFLAGS='-O0 -g'" - -alias mmi 'mm && mi' diff --git a/bin/setup.sh b/bin/setup.sh deleted file mode 100755 index f49dd48dd860..000000000000 --- a/bin/setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright 2013, Juniper Networks, Inc. -# All rights reserved. -# This SOFTWARE is licensed under the LICENSE provided in the -# ../Copyright file. By downloading, installing, copying, or otherwise -# using the SOFTWARE, you agree to be bound by the terms of that -# LICENSE. - - -if [ ! -f configure ]; then - vers=`autoreconf --version | head -1` - echo "Using" $vers - - mkdir -p m4 - - autoreconf --install - - if [ ! -f configure ]; then - echo "Failed to create configure script" - exit 1 - fi -fi - -echo "Creating build directory ..." -mkdir build - -echo "Setup is complete. To build libslax:" - -echo " 1) Type 'cd build ; ../configure' to configure libslax" -echo " 2) Type 'make' to build libslax" -echo " 3) Type 'make install' to install libslax" - -exit 0 diff --git a/build/.create b/build/.create deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/install-sh b/install-sh index 377bb8687ffe..0b0fdcbba69a 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -207,6 +203,15 @@ if test $# -eq 0; then exit 0 fi +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -223,16 +228,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/libxo/xo_config.h b/libxo/xo_config.h.in similarity index 70% rename from libxo/xo_config.h rename to libxo/xo_config.h.in index 9177962f08d9..614e7fec728a 100644 --- a/libxo/xo_config.h +++ b/libxo/xo_config.h.in @@ -1,221 +1,220 @@ -/* libxo/xo_config.h. Generated from xo_config.h.in by configure. */ /* libxo/xo_config.h.in. Generated from configure.ac by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +#undef CRAY_STACKSEG_END /* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ +#undef C_ALLOCA /* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 +#undef HAVE_ALLOCA /* Define to 1 if you have and it should be used (not on Ultrix). */ -/* #undef HAVE_ALLOCA_H */ +#undef HAVE_ALLOCA_H /* Define to 1 if you have the `asprintf' function. */ -#define HAVE_ASPRINTF 1 +#undef HAVE_ASPRINTF /* Define to 1 if you have the `bzero' function. */ -#define HAVE_BZERO 1 +#undef HAVE_BZERO /* Define to 1 if you have the `ctime' function. */ -#define HAVE_CTIME 1 +#undef HAVE_CTIME /* Define to 1 if you have the header file. */ -#define HAVE_CTYPE_H 1 +#undef HAVE_CTYPE_H /* Define to 1 if you have the declaration of `__isthreaded', and to 0 if you don't. */ -#define HAVE_DECL___ISTHREADED 1 +#undef HAVE_DECL___ISTHREADED /* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 +#undef HAVE_DLFCN_H /* Define to 1 if you have the `dlfunc' function. */ -#define HAVE_DLFUNC 1 +#undef HAVE_DLFUNC /* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 +#undef HAVE_ERRNO_H /* Define to 1 if you have the `fdopen' function. */ -#define HAVE_FDOPEN 1 +#undef HAVE_FDOPEN /* Define to 1 if you have the `flock' function. */ -#define HAVE_FLOCK 1 +#undef HAVE_FLOCK /* Define to 1 if you have the `getpass' function. */ -#define HAVE_GETPASS 1 +#undef HAVE_GETPASS /* Define to 1 if you have the `getprogname' function. */ -#define HAVE_GETPROGNAME 1 +#undef HAVE_GETPROGNAME /* Define to 1 if you have the `getrusage' function. */ -#define HAVE_GETRUSAGE 1 +#undef HAVE_GETRUSAGE /* gettext(3) */ -/* #undef HAVE_GETTEXT */ +#undef HAVE_GETTEXT /* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 +#undef HAVE_GETTIMEOFDAY /* humanize_number(3) */ -#define HAVE_HUMANIZE_NUMBER 1 +#undef HAVE_HUMANIZE_NUMBER /* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 +#undef HAVE_INTTYPES_H /* Define to 1 if you have the `crypto' library (-lcrypto). */ -#define HAVE_LIBCRYPTO 1 +#undef HAVE_LIBCRYPTO /* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 +#undef HAVE_LIBM /* Define to 1 if you have the header file. */ -#define HAVE_LIBUTIL_H 1 +#undef HAVE_LIBUTIL_H /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ -#define HAVE_MALLOC 1 +#undef HAVE_MALLOC /* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 +#undef HAVE_MEMMOVE /* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 +#undef HAVE_MEMORY_H /* Support printflike */ -/* #undef HAVE_PRINTFLIKE */ +#undef HAVE_PRINTFLIKE /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ -#define HAVE_REALLOC 1 +#undef HAVE_REALLOC /* Define to 1 if you have the `srand' function. */ -#define HAVE_SRAND 1 +#undef HAVE_SRAND /* Define to 1 if you have the `sranddev' function. */ -#define HAVE_SRANDDEV 1 +#undef HAVE_SRANDDEV /* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 +#undef HAVE_STDINT_H /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDIO_EXT_H */ +#undef HAVE_STDIO_EXT_H /* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 +#undef HAVE_STDIO_H /* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 +#undef HAVE_STDLIB_H /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDTIME_TZFILE_H */ +#undef HAVE_STDTIME_TZFILE_H /* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 +#undef HAVE_STRCHR /* Define to 1 if you have the `strcspn' function. */ -#define HAVE_STRCSPN 1 +#undef HAVE_STRCSPN /* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 +#undef HAVE_STRERROR /* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 +#undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 +#undef HAVE_STRING_H /* Define to 1 if you have the `strlcpy' function. */ -#define HAVE_STRLCPY 1 +#undef HAVE_STRLCPY /* Define to 1 if you have the `strspn' function. */ -#define HAVE_STRSPN 1 +#undef HAVE_STRSPN /* Have struct sockaddr_un.sun_len */ -#define HAVE_SUN_LEN 1 +#undef HAVE_SUN_LEN /* Define to 1 if you have the `sysctlbyname' function. */ -#define HAVE_SYSCTLBYNAME 1 +#undef HAVE_SYSCTLBYNAME /* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +#undef HAVE_SYS_PARAM_H /* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +#undef HAVE_SYS_STAT_H /* Define to 1 if you have the header file. */ -#define HAVE_SYS_SYSCTL_H 1 +#undef HAVE_SYS_SYSCTL_H /* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 +#undef HAVE_SYS_TIME_H /* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 +#undef HAVE_SYS_TYPES_H /* Define to 1 if you have the header file. */ -#define HAVE_THREADS_H 1 +#undef HAVE_THREADS_H /* thread-local setting */ -#define HAVE_THREAD_LOCAL THREAD_LOCAL_before +#undef HAVE_THREAD_LOCAL /* Define to 1 if you have the header file. */ -/* #undef HAVE_TZFILE_H */ +#undef HAVE_TZFILE_H /* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 +#undef HAVE_UNISTD_H /* Define to 1 if you have the `__flbf' function. */ -/* #undef HAVE___FLBF */ +#undef HAVE___FLBF /* Enable debugging */ -/* #undef LIBXO_DEBUG */ +#undef LIBXO_DEBUG /* Enable text-only rendering */ -/* #undef LIBXO_TEXT_ONLY */ +#undef LIBXO_TEXT_ONLY /* Version number as dotted value */ -#define LIBXO_VERSION "0.4.3" +#undef LIBXO_VERSION /* Version number extra information */ -#define LIBXO_VERSION_EXTRA "" +#undef LIBXO_VERSION_EXTRA /* Version number as a number */ -#define LIBXO_VERSION_NUMBER 4003 +#undef LIBXO_VERSION_NUMBER /* Version number as string */ -#define LIBXO_VERSION_STRING "4003" +#undef LIBXO_VERSION_STRING /* Enable local wcwidth implementation */ -#define LIBXO_WCWIDTH 1 +#undef LIBXO_WCWIDTH /* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" +#undef LT_OBJDIR /* Name of package */ -#define PACKAGE "libxo" +#undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "phil@juniper.net" +#undef PACKAGE_BUGREPORT /* Define to the full name of this package. */ -#define PACKAGE_NAME "libxo" +#undef PACKAGE_NAME /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxo 0.4.3" +#undef PACKAGE_STRING /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libxo" +#undef PACKAGE_TARNAME /* Define to the home page for this package. */ -#define PACKAGE_URL "" +#undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.4.3" +#undef PACKAGE_VERSION /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -223,25 +222,25 @@ STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ +#undef STACK_DIRECTION /* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +#undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.4.3" +#undef VERSION /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus -/* #undef inline */ +#undef inline #endif /* Define to rpl_malloc if the replacement function should be used. */ -/* #undef malloc */ +#undef malloc /* Define to rpl_realloc if the replacement function should be used. */ -/* #undef realloc */ +#undef realloc /* Define to `unsigned int' if does not define. */ -/* #undef size_t */ +#undef size_t diff --git a/libxo/xo_format.5 b/libxo/xo_format.5 index 89c010391d51..1db4fc8dc118 100644 --- a/libxo/xo_format.5 +++ b/libxo/xo_format.5 @@ -7,7 +7,7 @@ .\" # LICENSE. .\" # Phil Shafer, July 2014 .\" -.Dd November 6, 2015 +.Dd December 4, 2014 .Dt LIBXO 3 .Os .Sh NAME @@ -367,7 +367,7 @@ particular output styles: .It l "leaf-list " "Field is a leaf-list, a list of leaf values" .It n "no-quotes " "Do not quote the field when using JSON style" .It q "quotes " "Quote the field when using JSON style" -.It t "trim " "Trim leading and trailing whitespace" +.It q "trim " "Trim leading and trailing whitespace" .It w "white space " "A blank ("" "") is appended after the label" .El .Pp diff --git a/libxo/xo_open_container.3 b/libxo/xo_open_container.3 index 8b016dc15ef6..9e48fbeeecea 100644 --- a/libxo/xo_open_container.3 +++ b/libxo/xo_open_container.3 @@ -121,7 +121,7 @@ traditional C strings can be used directly. The close functions with the .Dq _d suffix are used in -.Dq \&Do The Right Thing +.Dq Do The Right Thing mode, where the name of the open containers, lists, and instances are maintained internally by .Nm libxo @@ -151,7 +151,7 @@ Some users may find tracking the names of open containers, lists, and instances inconvenient. .Nm libxo offers a -.Dq \&Do The Right Thing +.Dq Do The Right Thing mode, where .Nm libxo will track the names of open containers, lists, and instances so diff --git a/libxo/xo_syslog.c b/libxo/xo_syslog.c index da53e0c2e58e..c7d67f3cfcd3 100644 --- a/libxo/xo_syslog.c +++ b/libxo/xo_syslog.c @@ -91,7 +91,7 @@ #elif defined(__macosx__) #define XO_DEFAULT_EID 63 #else -#define XO_DEFAULT_EID 32473 /* Bail; use "example" number */ +#define XO_DEFAULT_EID 32473 /* Fallback to the "example" number */ #endif #ifdef _SC_HOST_NAME_MAX