Projects

projects@lrde.epita.fr

1049 discussions

argp r4: Fix the check that detects whether __attribute__ works.

by SIGOURE Benoit

URL: https://svn.lrde.epita.fr/svn/argp/trunk ChangeLog: 2007-02-02 SIGOURE Benoit <tsuna(a)lrde.epita.fr> Fix the check that detects whether __attribute__ works. * Makefile.am (AUTOMAKE_OPTIONS): Remove. * acinclude.m4 (LSH_TYPE_SOCKLEN_T, LSH_PATH_ADD, LSH_PATH_ADD, LSH_RPATH_INIT, LSH_RPATH_FIX, LSH_CHECK_KRB_LIB, LSH_LIB_ARGP, LSH_GCC_FUNCTION_NAME, LSH_FUNC_ALLOCA, LSH_FUNC_STRERROR, LSH_FUNC_STRSIGNAL, AX_CREATE_STDINT_H): Remove unused macro definitions. (LSH_GCC_ATTRIBUTES): Fix the check. * configure.ac: Update configure style by removing obsolete constructs. Makefile.am | 5 acinclude.m4 | 956 ----------------------------------------------------------- configure.ac | 34 +- vcs/local.rb | 2 4 files changed, 34 insertions(+), 963 deletions(-) Index: trunk/vcs/local.rb =================================================================== --- trunk/vcs/local.rb (revision 3) +++ trunk/vcs/local.rb (revision 4) @@ -6,7 +6,7 @@ protocol_version '0.1' def local_commit! ( *args ) - common_commit!("<%= rev %>: <%= title %>", *args) do |subject| + common_commit!("argp <%= rev %>: <%= title %>", *args) do |subject| mail!(:to => %w[projects(a)lrde.epita.fr], :subject => subject) end end Index: trunk/configure.ac =================================================================== --- trunk/configure.ac (revision 3) +++ trunk/configure.ac (revision 4) @@ -1,11 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl This configure.ac is only for building a standalone argp library. -AC_PREREQ(2.54) -AC_INIT(argp-ba.c) +AC_PREREQ([2.59]) +AC_INIT([argp-standalone], [1.4-lrde], [projects(a)lrde.epita.fr]) +AC_CONFIG_SRCDIR([argp-ba.c]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE(argp, standalone-1.4) -AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE([1.9.6 foreign -Wall]) +AM_CONFIG_HEADER([config.h]) # GNU libc defaults to supplying the ISO C library functions only. The # _GNU_SOURCE define enables these extensions, in particular we want @@ -20,14 +21,14 @@ AM_PROG_CC_STDC if test "x$am_cv_prog_cc_stdc" = xno ; then - AC_ERROR([the C compiler does not handle ANSI-C]) + AC_MSG_ERROR([the C compiler does not handle ANSI-C]) fi # Checks for libraries. # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(limits.h malloc.h unistd.h sysexits.h stdarg.h) +AC_CHECK_HEADERS([limits.h malloc.h unistd.h sysexits.h stdarg.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -39,9 +40,9 @@ # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_VPRINTF -AC_CHECK_FUNCS(strerror sleep getpid snprintf) +AC_CHECK_FUNCS([strerror sleep getpid snprintf]) -AC_REPLACE_FUNCS(mempcpy strndup strchrnul strcasecmp vsnprintf) +AC_REPLACE_FUNCS([mempcpy strndup strchrnul strcasecmp vsnprintf]) dnl ARGP_CHECK_FUNC(includes, function-call [, if-found [, if-not-found]]) AC_DEFUN([ARGP_CHECK_FUNC], @@ -54,12 +55,12 @@ [AS_VAR_SET(ac_var, yes)], [AS_VAR_SET(ac_var, no)])]) if test AS_VAR_GET(ac_var) = yes ; then - ifelse([$3],, + ifelse([$3], [], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]ac_func))], [$3 ]) else - ifelse([$4],, true, [$4]) + ifelse([$4], [], true, [$4]) fi AS_VAR_POPDEF([ac_var]) AS_VAR_POPDEF([ac_func]) @@ -69,11 +70,11 @@ # AC_CHECK_FUNCS doesn't work well. ARGP_CHECK_FUNC([#include <stdio.h>], [putc_unlocked('x', stdout)]) -AC_CHECK_FUNCS(flockfile) -AC_CHECK_FUNCS(fputs_unlocked fwrite_unlocked) +AC_CHECK_FUNCS([flockfile]) +AC_CHECK_FUNCS([fputs_unlocked fwrite_unlocked]) # Used only by argp-test.c, so don't use AC_REPLACE_FUNCS. -AC_CHECK_FUNCS(strdup asprintf) +AC_CHECK_FUNCS([strdup asprintf]) AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name], [], [], [[#include <errno.h>]]) @@ -94,4 +95,9 @@ CPPFLAGS="$CPPFLAGS -I$srcdir" -AC_OUTPUT(Makefile testsuite/Makefile) +AC_CONFIG_FILES([ + Makefile + testsuite/Makefile +]) + +AC_OUTPUT Index: trunk/acinclude.m4 =================================================================== --- trunk/acinclude.m4 (revision 3) +++ trunk/acinclude.m4 (revision 4) @@ -1,291 +1,9 @@ -dnl Try to detect the type of the third arg to getsockname() et al -AC_DEFUN([LSH_TYPE_SOCKLEN_T], -[AH_TEMPLATE([socklen_t], [Length type used by getsockopt]) -AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_type_socklen_t, -[AC_EGREP_HEADER(socklen_t, sys/socket.h, - [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])]) -if test $ac_cv_type_socklen_t = no; then - AC_MSG_CHECKING(for AIX) - AC_EGREP_CPP(yes, [ -#ifdef _AIX - yes -#endif -],[ -AC_MSG_RESULT(yes) -AC_DEFINE(socklen_t, size_t) -],[ -AC_MSG_RESULT(no) -AC_DEFINE(socklen_t, int) -]) -fi -]) - -dnl LSH_PATH_ADD(path-id, directory) -AC_DEFUN([LSH_PATH_ADD], -[AC_MSG_CHECKING($2) -ac_exists=no -if test -d "$2/." ; then - ac_real_dir=`cd $2 && pwd` - if test -n "$ac_real_dir" ; then - ac_exists=yes - for old in $1_REAL_DIRS ; do - ac_found=no - if test x$ac_real_dir = x$old ; then - ac_found=yes; - break; - fi - done - if test $ac_found = yes ; then - AC_MSG_RESULT(already added) - else - AC_MSG_RESULT(added) - # LDFLAGS="$LDFLAGS -L $2" - $1_REAL_DIRS="$ac_real_dir [$]$1_REAL_DIRS" - $1_DIRS="$2 [$]$1_DIRS" - fi - fi -fi -if test $ac_exists = no ; then - AC_MSG_RESULT(not found) -fi -]) - -dnl LSH_RPATH_ADD(dir) -AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)]) - -dnl LSH_RPATH_INIT(candidates) -AC_DEFUN([LSH_RPATH_INIT], -[AC_MSG_CHECKING([for -R flag]) -RPATHFLAG='' -case `uname -sr` in - OSF1\ V4.*) - RPATHFLAG="-rpath " - ;; - IRIX\ 6.*) - RPATHFLAG="-rpath " - ;; - IRIX\ 5.*) - RPATHFLAG="-rpath " - ;; - SunOS\ 5.*) - if test "$TCC" = "yes"; then - # tcc doesn't know about -R - RPATHFLAG="-Wl,-R," - else - RPATHFLAG=-R - fi - ;; - Linux\ 2.*) - RPATHFLAG="-Wl,-rpath," - ;; - *) - : - ;; -esac - -if test x$RPATHFLAG = x ; then - AC_MSG_RESULT(none) -else - AC_MSG_RESULT([using $RPATHFLAG]) -fi - -RPATH_CANDIDATE_REAL_DIRS='' -RPATH_CANDIDATE_DIRS='' - -AC_MSG_RESULT([Searching for libraries]) - -for d in $1 ; do - LSH_RPATH_ADD($d) -done -]) - -dnl Try to execute a main program, and if it fails, try adding some -dnl -R flag. -dnl LSH_RPATH_FIX -AC_DEFUN([LSH_RPATH_FIX], -[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then - ac_success=no - AC_TRY_RUN([int main(int argc, char **argv) { return 0; }], - ac_success=yes, ac_success=no, :) - - if test $ac_success = no ; then - AC_MSG_CHECKING([Running simple test program failed. Trying -R flags]) -dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS - ac_remaining_dirs='' - ac_rpath_save_LDFLAGS="$LDFLAGS" - for d in $RPATH_CANDIDATE_DIRS ; do - if test $ac_success = yes ; then - ac_remaining_dirs="$ac_remaining_dirs $d" - else - LDFLAGS="$RPATHFLAG$d $LDFLAGS" -dnl echo LDFLAGS = $LDFLAGS - AC_TRY_RUN([int main(int argc, char **argv) { return 0; }], - [ac_success=yes - ac_rpath_save_LDFLAGS="$LDFLAGS" - AC_MSG_RESULT([adding $RPATHFLAG$d]) - ], - [ac_remaining_dirs="$ac_remaining_dirs $d"], :) - LDFLAGS="$ac_rpath_save_LDFLAGS" - fi - done - RPATH_CANDIDATE_DIRS=$ac_remaining_dirs - fi - if test $ac_success = no ; then - AC_MSG_RESULT(failed) - fi -fi -]) - -dnl Like AC_CHECK_LIB, but uses $KRB_LIBS rather than $LIBS. -dnl LSH_CHECK_KRB_LIB(LIBRARY, FUNCTION, [, ACTION-IF-FOUND [, -dnl ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) - -AC_DEFUN([LSH_CHECK_KRB_LIB], -[AC_CHECK_LIB([$1], [$2], - ifelse([$3], , - [[ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - AC_DEFINE_UNQUOTED($ac_tr_lib) - KRB_LIBS="-l$1 $KRB_LIBS" - ]], [$3]), - ifelse([$4], , , [$4 -])dnl -, [$5 $KRB_LIBS]) -]) - -dnl LSH_LIB_ARGP(ACTION-IF-OK, ACTION-IF-BAD) -AC_DEFUN([LSH_LIB_ARGP], -[ ac_argp_save_LIBS="$LIBS" - ac_argp_save_LDFLAGS="$LDFLAGS" - ac_argp_ok=no - # First check if we can link with argp. - AC_SEARCH_LIBS(argp_parse, argp, - [ LSH_RPATH_FIX - AC_CACHE_CHECK([for working argp], - lsh_cv_lib_argp_works, - [ AC_TRY_RUN( -[#include <argp.h> -#include <stdlib.h> - -static const struct argp_option -options[] = -{ - { NULL, 0, NULL, 0, NULL, 0 } -}; - -struct child_state -{ - int n; -}; - -static error_t -child_parser(int key, char *arg, struct argp_state *state) -{ - struct child_state *input = (struct child_state *) state->input; - - switch(key) - { - default: - return ARGP_ERR_UNKNOWN; - case ARGP_KEY_END: - if (!input->n) - input->n = 1; - break; - } - return 0; -} - -const struct argp child_argp = -{ - options, - child_parser, - NULL, NULL, NULL, NULL, NULL -}; - -struct main_state -{ - struct child_state child; - int m; -}; - -static error_t -main_parser(int key, char *arg, struct argp_state *state) -{ - struct main_state *input = (struct main_state *) state->input; - - switch(key) - { - default: - return ARGP_ERR_UNKNOWN; - case ARGP_KEY_INIT: - state->child_inputs[0] = &input->child; - break; - case ARGP_KEY_END: - if (!input->m) - input->m = input->child.n; - - break; - } - return 0; -} - -static const struct argp_child -main_children[] = -{ - { &child_argp, 0, "", 0 }, - { NULL, 0, NULL, 0} -}; - -static const struct argp -main_argp = -{ options, main_parser, - NULL, - NULL, - main_children, - NULL, NULL -}; - -int main(int argc, char **argv) -{ - struct main_state input = { { 0 }, 0 }; - char *v[2] = { "foo", NULL }; - - argp_parse(&main_argp, 1, v, 0, NULL, &input); - - if ( (input.m == 1) && (input.child.n == 1) ) - return 0; - else - return 1; -} -], lsh_cv_lib_argp_works=yes, - lsh_cv_lib_argp_works=no, - lsh_cv_lib_argp_works=no)]) - - if test x$lsh_cv_lib_argp_works = xyes ; then - ac_argp_ok=yes - else - # Reset link flags - LIBS="$ac_argp_save_LIBS" - LDFLAGS="$ac_argp_save_LDFLAGS" - fi]) - - if test x$ac_argp_ok = xyes ; then - ifelse([$1],, true, [$1]) - else - ifelse([$2],, true, [$2]) - fi -]) - dnl LSH_GCC_ATTRIBUTES dnl Check for gcc's __attribute__ construction - AC_DEFUN([LSH_GCC_ATTRIBUTES], -[AC_CACHE_CHECK(for __attribute__, - lsh_cv_c_attribute, -[ AC_TRY_COMPILE([ +[AC_CACHE_CHECK([for __attribute__], [lsh_cv_c_attribute], + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include <stdlib.h> -], -[ static void foo(void) __attribute__ ((noreturn)); static void __attribute__ ((noreturn)) @@ -293,17 +11,17 @@ { exit(1); } -], -lsh_cv_c_attribute=yes, -lsh_cv_c_attribute=no)]) +]])], [lsh_cv_c_attribute=yes], [lsh_cv_c_attribute=no]) +]) -AH_TEMPLATE([HAVE_GCC_ATTRIBUTE], [Define if the compiler understands __attribute__]) -if test "x$lsh_cv_c_attribute" = "xyes"; then - AC_DEFINE(HAVE_GCC_ATTRIBUTE) +AH_TEMPLATE([HAVE_GCC_ATTRIBUTE], + [Define if the compiler understands __attribute__]) +if test "x$lsh_cv_c_attribute" = xyes; then + AC_DEFINE([HAVE_GCC_ATTRIBUTE]) fi -AH_BOTTOM( -[#if __GNUC__ && HAVE_GCC_ATTRIBUTE +AH_BOTTOM([ +#if __GNUC__ && HAVE_GCC_ATTRIBUTE # define NORETURN __attribute__ ((__noreturn__)) # define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a))) # define UNUSED __attribute__ ((__unused__)) @@ -312,657 +30,5 @@ # define PRINTF_STYLE(f, a) # define UNUSED #endif -])]) - -AC_DEFUN([LSH_GCC_FUNCTION_NAME], -[# Check for gcc's __FUNCTION__ variable -AH_TEMPLATE([HAVE_GCC_FUNCTION], - [Define if the compiler understands __FUNCTION__]) -AH_BOTTOM( -[#if HAVE_GCC_FUNCTION -# define FUNCTION_NAME __FUNCTION__ -#else -# define FUNCTION_NAME "Unknown" -#endif -]) - -AC_CACHE_CHECK(for __FUNCTION__, - lsh_cv_c_FUNCTION, - [ AC_TRY_COMPILE(, - [ #if __GNUC__ == 3 - # error __FUNCTION__ is broken in gcc-3 - #endif - void foo(void) { char c = __FUNCTION__[0]; } ], - lsh_cv_c_FUNCTION=yes, - lsh_cv_c_FUNCTION=no)]) - -if test "x$lsh_cv_c_FUNCTION" = "xyes"; then - AC_DEFINE(HAVE_GCC_FUNCTION) -fi -]) - -# Check for alloca, and include the standard blurb in config.h -AC_DEFUN([LSH_FUNC_ALLOCA], -[AC_FUNC_ALLOCA -AH_BOTTOM( -[/* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ -# if HAVE_ALLOCA_H -# include <alloca.h> -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#else /* defined __GNUC__ */ -# if HAVE_ALLOCA_H -# include <alloca.h> -# endif -#endif -])]) - -AC_DEFUN([LSH_FUNC_STRERROR], -[AC_CHECK_FUNCS(strerror) -AH_BOTTOM( -[#if HAVE_STRERROR -#define STRERROR strerror -#else -#define STRERROR(x) (sys_errlist[x]) -#endif -])]) - -AC_DEFUN([LSH_FUNC_STRSIGNAL], -[AC_CHECK_FUNCS(strsignal) -AC_CHECK_DECLS([sys_siglist, _sys_siglist]) -AH_BOTTOM( -[#if HAVE_STRSIGNAL -# define STRSIGNAL strsignal -#else /* !HAVE_STRSIGNAL */ -# if HAVE_DECL_SYS_SIGLIST -# define STRSIGNAL(x) (sys_siglist[x]) -# else -# if HAVE_DECL__SYS_SIGLIST -# define STRSIGNAL(x) (_sys_siglist[x]) -# else -# define STRSIGNAL(x) "Unknown signal" -# if __GNUC__ -# warning Using dummy STRSIGNAL -# endif -# endif -# endif -#endif /* !HAVE_STRSIGNAL */ -])]) - -dnl @synopsis AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])] -dnl -dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the -dnl existence of an include file <stdint.h> that defines a set of -dnl typedefs, especially uint8_t,int32_t,uintptr_t. -dnl Many older installations will not provide this file, but some will -dnl have the very same definitions in <inttypes.h>. In other enviroments -dnl we can use the inet-types in <sys/types.h> which would define the -dnl typedefs int8_t and u_int8_t respectivly. -dnl -dnl This macros will create a local "_stdint.h" or the headerfile given as -dnl an argument. In many cases that file will just "#include <stdint.h>" -dnl or "#include <inttypes.h>", while in other environments it will provide -dnl the set of basic 'stdint's definitions/typedefs: -dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t -dnl int_least32_t.. int_fast32_t.. intmax_t -dnl which may or may not rely on the definitions of other files, -dnl or using the AC_CHECK_SIZEOF macro to determine the actual -dnl sizeof each type. -dnl -dnl if your header files require the stdint-types you will want to create an -dnl installable file mylib-int.h that all your other installable header -dnl may include. So if you have a library package named "mylib", just use -dnl AX_CREATE_STDINT_H(mylib-int.h) -dnl in configure.ac and go to install that very header file in Makefile.am -dnl along with the other headers (mylib.h) - and the mylib-specific headers -dnl can simply use "#include <mylib-int.h>" to obtain the stdint-types. -dnl -dnl Remember, if the system already had a valid <stdint.h>, the generated -dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things... -dnl -dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/) -dnl @version $Id: acinclude.m4 1289 2004-02-23 16:22:02Z akim $ -dnl @author Guido Draheim <guidod(a)gmx.de> - -AC_DEFUN([AX_CREATE_STDINT_H], -[# ------ AX CREATE STDINT H ------------------------------------- -AC_MSG_CHECKING([for stdint types]) -ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` -# try to shortcircuit - if the default include path of the compiler -# can find a "stdint.h" header then we assume that all compilers can. -AC_CACHE_VAL([ac_cv_header_stdint_t],[ -old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" -old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" -old_CFLAGS="$CFLAGS" ; CFLAGS="" -AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;], -[ac_cv_stdint_result="(assuming C99 compatible system)" - ac_cv_header_stdint_t="stdint.h"; ], -[ac_cv_header_stdint_t=""]) -CXXFLAGS="$old_CXXFLAGS" -CPPFLAGS="$old_CPPFLAGS" -CFLAGS="$old_CFLAGS" ]) - -v="... $ac_cv_header_stdint_h" -if test "$ac_stdint_h" = "stdint.h" ; then - AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)]) -elif test "$ac_stdint_h" = "inttypes.h" ; then - AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)]) -elif test "_$ac_cv_header_stdint_t" = "_" ; then - AC_MSG_RESULT([(putting them into $ac_stdint_h)$v]) -else - ac_cv_header_stdint="$ac_cv_header_stdint_t" - AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)]) -fi - -if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. - -dnl .....intro message done, now do a few system checks..... -dnl btw, all CHECK_TYPE macros do automatically "DEFINE" a type, therefore -dnl we use the autoconf implementation detail _AC CHECK_TYPE_NEW instead - -inttype_headers=`echo $2 | sed -e 's/,/ /g'` - -ac_cv_stdint_result="(no helpful system typedefs seen)" -AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[ - ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) - AC_MSG_RESULT([(..)]) - for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do - unset ac_cv_type_uintptr_t - unset ac_cv_type_uint64_t - _AC_CHECK_TYPE_NEW(uintptr_t,[ac_cv_header_stdint_x=$i],dnl - continue,[#include <$i>]) - AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) - ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" - break; - done - AC_MSG_CHECKING([for stdint uintptr_t]) - ]) - -if test "_$ac_cv_header_stdint_x" = "_" ; then -AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[ - ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) - AC_MSG_RESULT([(..)]) - for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do - unset ac_cv_type_uint32_t - unset ac_cv_type_uint64_t - AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],dnl - continue,[#include <$i>]) - AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) - ac_cv_stdint_result="(seen uint32_t$and64 in $i)" - break; - done - AC_MSG_CHECKING([for stdint uint32_t]) - ]) -fi - -if test "_$ac_cv_header_stdint_x" = "_" ; then -if test "_$ac_cv_header_stdint_o" = "_" ; then -AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[ - ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) - AC_MSG_RESULT([(..)]) - for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do - unset ac_cv_type_u_int32_t - unset ac_cv_type_u_int64_t - AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],dnl - continue,[#include <$i>]) - AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>]) - ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" - break; - done - AC_MSG_CHECKING([for stdint u_int32_t]) - ]) -fi fi - -dnl if there was no good C99 header file, do some typedef checks... -if test "_$ac_cv_header_stdint_x" = "_" ; then - AC_MSG_CHECKING([for stdint datatype model]) - AC_MSG_RESULT([(..)]) - AC_CHECK_SIZEOF(char) - AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(void*) - ac_cv_stdint_char_model="" - ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_char" - ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_short" - ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_int" - ac_cv_stdint_long_model="" - ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_int" - ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_long" - ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_voidp" - name="$ac_cv_stdint_long_model" - case "$ac_cv_stdint_char_model/$ac_cv_stdint_long_model" in - 122/242) name="$name, IP16 (standard 16bit machine)" ;; - 122/244) name="$name, LP32 (standard 32bit mac/win)" ;; - 122/*) name="$name (unusual int16 model)" ;; - 124/444) name="$name, ILP32 (standard 32bit unixish)" ;; - 124/488) name="$name, LP64 (standard 64bit unixish)" ;; - 124/448) name="$name, LLP64 (unusual 64bit unixish)" ;; - 124/*) name="$name (unusual int32 model)" ;; - 128/888) name="$name, ILP64 (unusual 64bit numeric)" ;; - 128/*) name="$name (unusual int64 model)" ;; - 222/*|444/*) name="$name (unusual dsptype)" ;; - *) name="$name (very unusal model)" ;; - esac - AC_MSG_RESULT([combined for stdint datatype model... $name]) -fi - -if test "_$ac_cv_header_stdint_x" != "_" ; then - ac_cv_header_stdint="$ac_cv_header_stdint_x" -elif test "_$ac_cv_header_stdint_o" != "_" ; then - ac_cv_header_stdint="$ac_cv_header_stdint_o" -elif test "_$ac_cv_header_stdint_u" != "_" ; then - ac_cv_header_stdint="$ac_cv_header_stdint_u" -else - ac_cv_header_stdint="stddef.h" -fi - -AC_MSG_CHECKING([for extra inttypes in chosen header]) -AC_MSG_RESULT([($ac_cv_header_stdint)]) -dnl see if int_least and int_fast types are present in _this_ header. -unset ac_cv_type_int_least32_t -unset ac_cv_type_int_fast32_t -AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>]) -AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>]) -AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>]) - -fi # shortcircut to system "stdint.h" -# ------------------ PREPARE VARIABLES ------------------------------ -if test "$GCC" = "yes" ; then -ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` -else -ac_cv_stdint_message="using $CC" -fi - -AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl -$ac_cv_stdint_result]) - -# ----------------- DONE inttypes.h checks START header ------------- -AC_CONFIG_COMMANDS([$ac_stdint_h],[ -AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h) -ac_stdint=$tmp/_stdint.h - -echo "#ifndef" $_ac_stdint_h >$ac_stdint -echo "#define" $_ac_stdint_h "1" >>$ac_stdint -echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint -echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint -echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint -if test "_$ac_cv_header_stdint_t" != "_" ; then -echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint -fi - -cat >>$ac_stdint <<STDINT_EOF - -/* ................... shortcircuit part ........................... */ - -#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H -#include <stdint.h> -#else -#include <stddef.h> - -/* .................... configured part ............................ */ - -STDINT_EOF - -echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint -if test "_$ac_cv_header_stdint_x" != "_" ; then - ac_header="$ac_cv_header_stdint_x" - echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint -else - echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint -fi - -echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint -if test "_$ac_cv_header_stdint_o" != "_" ; then - ac_header="$ac_cv_header_stdint_o" - echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint -else - echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint -fi - -echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint -if test "_$ac_cv_header_stdint_u" != "_" ; then - ac_header="$ac_cv_header_stdint_u" - echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint -else - echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint -fi - -echo "" >>$ac_stdint - -if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then - echo "#include <$ac_header>" >>$ac_stdint - echo "" >>$ac_stdint -fi fi - -echo "/* which 64bit typedef has been found */" >>$ac_stdint -if test "$ac_cv_type_uint64_t" = "yes" ; then -echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint -else -echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint -fi -if test "$ac_cv_type_u_int64_t" = "yes" ; then -echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint -else -echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint -fi -echo "" >>$ac_stdint - -echo "/* which type model has been detected */" >>$ac_stdint -if test "_$ac_cv_stdint_char_model" != "_" ; then -echo "#define _STDINT_CHAR_MODEL" "$ac_cv_stdint_char_model" >>$ac_stdint -echo "#define _STDINT_LONG_MODEL" "$ac_cv_stdint_long_model" >>$ac_stdint -else -echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint -echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint -fi -echo "" >>$ac_stdint - -echo "/* whether int_least types were detected */" >>$ac_stdint -if test "$ac_cv_type_int_least32_t" = "yes"; then -echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint -else -echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint -fi -echo "/* whether int_fast types were detected */" >>$ac_stdint -if test "$ac_cv_type_int_fast32_t" = "yes"; then -echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint -else -echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint -fi -echo "/* whether intmax_t type was detected */" >>$ac_stdint -if test "$ac_cv_type_intmax_t" = "yes"; then -echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint -else -echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint -fi -echo "" >>$ac_stdint - - cat >>$ac_stdint <<STDINT_EOF -/* .................... detections part ............................ */ - -/* whether we need to define bitspecific types from compiler base types */ -#ifndef _STDINT_HEADER_INTPTR -#ifndef _STDINT_HEADER_UINT32 -#ifndef _STDINT_HEADER_U_INT32 -#define _STDINT_NEED_INT_MODEL_T -#else -#define _STDINT_HAVE_U_INT_TYPES -#endif -#endif -#endif - -#ifdef _STDINT_HAVE_U_INT_TYPES -#undef _STDINT_NEED_INT_MODEL_T -#endif - -#ifdef _STDINT_CHAR_MODEL -#if _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124 -#ifndef _STDINT_BYTE_MODEL -#define _STDINT_BYTE_MODEL 12 -#endif -#endif -#endif - -#ifndef _STDINT_HAVE_INT_LEAST32_T -#define _STDINT_NEED_INT_LEAST_T -#endif - -#ifndef _STDINT_HAVE_INT_FAST32_T -#define _STDINT_NEED_INT_FAST_T -#endif - -#ifndef _STDINT_HEADER_INTPTR -#define _STDINT_NEED_INTPTR_T -#ifndef _STDINT_HAVE_INTMAX_T -#define _STDINT_NEED_INTMAX_T -#endif -#endif - - -/* .................... definition part ............................ */ - -/* some system headers have good uint64_t */ -#ifndef _HAVE_UINT64_T -#if defined _STDINT_HAVE_UINT64_T || defined HAVE_UINT64_T -#define _HAVE_UINT64_T -#elif defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T -#define _HAVE_UINT64_T -typedef u_int64_t uint64_t; -#endif -#endif - -#ifndef _HAVE_UINT64_T -/* .. here are some common heuristics using compiler runtime specifics */ -#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L -#define _HAVE_UINT64_T -typedef long long int64_t; -typedef unsigned long long uint64_t; - -#elif !defined __STRICT_ANSI__ -#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ -#define _HAVE_UINT64_T -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__ -/* note: all ELF-systems seem to have loff-support which needs 64-bit */ -#if !defined _NO_LONGLONG -#define _HAVE_UINT64_T -typedef long long int64_t; -typedef unsigned long long uint64_t; -#endif - -#elif defined __alpha || (defined __mips && defined _ABIN32) -#if !defined _NO_LONGLONG -typedef long int64_t; -typedef unsigned long uint64_t; -#endif - /* compiler/cpu type to define int64_t */ -#endif -#endif -#endif - -#if defined _STDINT_HAVE_U_INT_TYPES -/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */ -typedef u_int8_t uint8_t; -typedef u_int16_t uint16_t; -typedef u_int32_t uint32_t; - -/* glibc compatibility */ -#ifndef __int8_t_defined -#define __int8_t_defined -#endif -#endif - -#ifdef _STDINT_NEED_INT_MODEL_T -/* we must guess all the basic types. Apart from byte-adressable system, */ -/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */ -/* (btw, those nibble-addressable systems are way off, or so we assume) */ - -dnl /* have a look at "64bit and data size neutrality" at */ -dnl /* http://unix.org/version2/whatsnew/login_64bit.html */ -dnl /* (the shorthand "ILP" types always have a "P" part) */ - -#if defined _STDINT_BYTE_MODEL -#if _STDINT_LONG_MODEL+0 == 242 -/* 2:4:2 = IP16 = a normal 16-bit system */ -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned long uint32_t; -#ifndef __int8_t_defined -#define __int8_t_defined -typedef char int8_t; -typedef short int16_t; -typedef long int32_t; -#endif -#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444 -/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */ -/* 4:4:4 = ILP32 = a normal 32-bit system */ -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#ifndef __int8_t_defined -#define __int8_t_defined -typedef char int8_t; -typedef short int16_t; -typedef int int32_t; -#endif -#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488 -/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */ -/* 4:8:8 = LP64 = a normal 64-bit system */ -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#ifndef __int8_t_defined -#define __int8_t_defined -typedef char int8_t; -typedef short int16_t; -typedef int int32_t; -#endif -/* this system has a "long" of 64bit */ -#ifndef _HAVE_UINT64_T -#define _HAVE_UINT64_T -typedef unsigned long uint64_t; -typedef long int64_t; -#endif -#elif _STDINT_LONG_MODEL+0 == 448 -/* LLP64 a 64-bit system derived from a 32-bit system */ -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#ifndef __int8_t_defined -#define __int8_t_defined -typedef char int8_t; -typedef short int16_t; -typedef int int32_t; -#endif -/* assuming the system has a "long long" */ -#ifndef _HAVE_UINT64_T -#define _HAVE_UINT64_T -typedef unsigned long long uint64_t; -typedef long long int64_t; -#endif -#else -#define _STDINT_NO_INT32_T -#endif -#else -#define _STDINT_NO_INT8_T -#define _STDINT_NO_INT32_T -#endif -#endif - -/* - * quote from SunOS-5.8 sys/inttypes.h: - * Use at your own risk. As of February 1996, the committee is squarely - * behind the fixed sized types; the "least" and "fast" types are still being - * discussed. The probability that the "fast" types may be removed before - * the standard is finalized is high enough that they are not currently - * implemented. - */ - -#if defined _STDINT_NEED_INT_LEAST_T -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -#ifdef _HAVE_UINT64_T -typedef int64_t int_least64_t; -#endif - -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -#ifdef _HAVE_UINT64_T -typedef uint64_t uint_least64_t; -#endif - /* least types */ -#endif - -#if defined _STDINT_NEED_INT_FAST_T -typedef int8_t int_fast8_t; -typedef int int_fast16_t; -typedef int32_t int_fast32_t; -#ifdef _HAVE_UINT64_T -typedef int64_t int_fast64_t; -#endif - -typedef uint8_t uint_fast8_t; -typedef unsigned uint_fast16_t; -typedef uint32_t uint_fast32_t; -#ifdef _HAVE_UINT64_T -typedef uint64_t uint_fast64_t; -#endif - /* fast types */ -#endif - -#ifdef _STDINT_NEED_INTMAX_T -#ifdef _HAVE_UINT64_T -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; -#else -typedef long intmax_t; -typedef unsigned long uintmax_t; -#endif -#endif - -#ifdef _STDINT_NEED_INTPTR_T -#ifndef __intptr_t_defined -#define __intptr_t_defined -/* we encourage using "long" to store pointer values, never use "int" ! */ -#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484 -typedef unsinged int uintptr_t; -typedef int intptr_t; -#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444 -typedef unsigned long uintptr_t; -typedef long intptr_t; -#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T -typedef uint64_t uintptr_t; -typedef int64_t intptr_t; -#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */ -typedef unsigned long uintptr_t; -typedef long intptr_t; -#endif -#endif -#endif - - /* shortcircuit*/ -#endif - /* once */ -#endif -#endif -STDINT_EOF - if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then - AC_MSG_NOTICE([$ac_stdint_h is unchanged]) - else - ac_dir=`AS_DIRNAME(["$ac_stdint_h"])` - AS_MKDIR_P(["$ac_dir"]) - rm -f $ac_stdint_h - mv $ac_stdint $ac_stdint_h - fi -],[# variables for create stdint.h replacement -PACKAGE="$PACKAGE" -VERSION="$VERSION" -ac_stdint_h="$ac_stdint_h" -_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h) -ac_cv_stdint_message="$ac_cv_stdint_message" -ac_cv_header_stdint_t="$ac_cv_header_stdint_t" -ac_cv_header_stdint_x="$ac_cv_header_stdint_x" -ac_cv_header_stdint_o="$ac_cv_header_stdint_o" -ac_cv_header_stdint_u="$ac_cv_header_stdint_u" -ac_cv_type_uint64_t="$ac_cv_type_uint64_t" -ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" -ac_cv_stdint_char_model="$ac_cv_stdint_char_model" -ac_cv_stdint_long_model="$ac_cv_stdint_long_model" -ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" -ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" -ac_cv_type_intmax_t="$ac_cv_type_intmax_t" -]) ]) +])dnl LSH_GCC_ATTRIBUTES Index: trunk/Makefile.am =================================================================== --- trunk/Makefile.am (revision 3) +++ trunk/Makefile.am (revision 4) @@ -1,6 +1,6 @@ # From glibc -# Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1997, 2003, 2004, 2007 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -16,9 +16,8 @@ # You should have received a copy of the GNU Library General Public # License along with the GNU C Library; see the file COPYING.LIB. If # not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -AUTOMAKE_OPTIONS = foreign SUBDIRS = . testsuite ACLOCAL_AMFLAGS = -I build-aux -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "On a long enough timeline, the survival rate /EPITA\ Promo 2008.CSI/ACU/YAKA for everyone drops to zero" -- Jack.

17 years, 11 months

r3: Update to argp-1.4.

by SIGOURE Benoit

URL: https://svn.lrde.epita.fr/svn/argp/trunk ChangeLog: 2007-02-02 SIGOURE Benoit <tsuna(a)lrde.epita.fr> Update to argp-1.4. * bootstrap: New. * build-aux: New. * strcasecmp.c: New. * vsnprintf.c: New. * argp-fs-xinl.c: Remove. * argp-xinl.c: Remove. * ChangeLog, * Makefile.am, * argp-ba.c, * argp-eexst.c, * argp-fmtstream.c, * argp-fmtstream.h, * argp-help.c, * argp-namefrob.h, * argp-parse.c, * argp-pv.c, * argp-pvh.c, * argp-test.c, * argp.h, * configure.ac: Update to 1.4. The following changes have been imported: 2004-03-02 Niels Möller <nisse(a)lysator.liu.se> * Makefile.am (EXTRA_DIST): Added strcasecmp.c. * argp-help.c: Declare strcasecmp. * strcasecmp.c (strcasecmp): New file. * argp-parse.c, argp-help.c: Conditionally include malloc.h. 2004-03-01 Niels Möller <nisse(a)lysator.liu.se> * argp-fmtstream.h [!HAVE_UNISTD_H]: Define ssize_t as int. * Makefile.am (EXTRA_PROGRAMS): Don't build argp-test, as it's the only program depending on the functions asprintf/vsnprintf. * configure.ac: Check for sleep and getpid. * argp-parse.c: Make inclusion of unistd.h conditional. (OPT_HANG): Recognize this option only if getpid and sleep are available. * argp-fmtstream.h: Make inclusion of unistd.h conditional. It's needed for ssize_t, at least on freebsd. 2004-03-01 Niels Möller <niels(a)s3.kth.se> * argp-eexst.c [!HAVE_SYSEXITS_H]: Hardcode EX_USAGE = 64. * configure.ac: Check for sysexits.h. trunk/Makefile.am | 3 trunk/argp-ba.c | 6 trunk/argp-eexst.c | 10 trunk/argp-fmtstream.c | 6 trunk/argp-fmtstream.h | 14 trunk/argp-help.c | 16 trunk/argp-namefrob.h | 6 trunk/argp-parse.c | 19 - trunk/argp-pv.c | 6 trunk/argp-pvh.c | 6 trunk/argp-test.c | 6 trunk/argp.h | 6 trunk/bootstrap | 3 trunk/configure.ac | 14 trunk/strcasecmp.c | 28 + trunk/vsnprintf.c | 833 +++++++++++++++++++++++++++++++++++++++++++++++++ 16 files changed, 938 insertions(+), 44 deletions(-) Index: trunk/argp.h =================================================================== --- trunk/argp.h (revision 2) +++ trunk/argp.h (revision 3) @@ -1,5 +1,5 @@ /* Hierarchial argument parsing. - Copyright (C) 1995, 96, 97, 98, 99, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 96, 97, 98, 99, 1995, 2003, 2005, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifndef _ARGP_H #define _ARGP_H Index: trunk/argp-fmtstream.h =================================================================== --- trunk/argp-fmtstream.h (revision 2) +++ trunk/argp-fmtstream.h (revision 3) @@ -1,5 +1,5 @@ /* Word-wrapping and line-truncating streams. - Copyright (C) 1997, 2003 Free Software Foundation, Inc. + Copyright (C) 1997, 2003, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* This package emulates glibc `line_wrap_stream' semantics for systems that don't have that. If the system does have it, it is just a wrapper for @@ -28,7 +28,15 @@ #include <stdio.h> #include <string.h> + +#if HAVE_UNISTD_H #include <unistd.h> +#else +/* This is a kludge to make the code compile on windows. Perhaps it + would be better to just replace ssize_t with int through out the + code. */ +# define ssize_t int +#endif #if _LIBC || (defined (HAVE_FLOCKFILE) && defined(HAVE_PUTC_UNLOCKED) \ && defined (HAVE_FPUTS_UNLOCKED) && defined (HAVE_FWRITE_UNLOCKED) ) Index: trunk/argp-parse.c =================================================================== --- trunk/argp-parse.c (revision 2) +++ trunk/argp-parse.c (revision 3) @@ -1,5 +1,5 @@ /* Hierarchial argument parsing - Copyright (C) 1995, 96, 97, 98, 99, 2000,2003 Free Software Foundation, Inc. + Copyright (C) 96, 97, 98, 99, 1995, 2000, 2003, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 @@ -43,10 +43,17 @@ #include <stdlib.h> #include <string.h> +#if HAVE_UNISTD_H #include <unistd.h> +#endif #include <limits.h> #include <assert.h> +#if HAVE_MALLOC_H +/* Needed, for alloca on windows */ +# include <malloc.h> +#endif + #ifndef _ /* This is for other GNU distributions with internationalized messages. When compiling libc, the _ macro is predefined. */ @@ -95,7 +102,9 @@ #define OPT_PROGNAME -2 #define OPT_USAGE -3 +#if HAVE_SLEEP && HAVE_GETPID #define OPT_HANG -4 +#endif static const struct argp_option argp_default_options[] = { @@ -103,8 +112,10 @@ {"usage", OPT_USAGE, 0, 0, N_("Give a short usage message"), 0 }, {"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, N_("Set the program name"), 0}, +#if OPT_HANG {"HANG", OPT_HANG, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN, N_("Hang for SECS seconds (default 3600)"), 0 }, +#endif {0, 0, 0, 0, 0, 0} }; @@ -144,6 +155,7 @@ break; +#if OPT_HANG case OPT_HANG: _argp_hang = atoi (arg ? arg : "3600"); fprintf(state->err_stream, "%s: pid = %ld\n", @@ -151,6 +163,7 @@ while (_argp_hang-- > 0) __sleep (1); break; +#endif default: return EBADKEY; Index: trunk/strcasecmp.c =================================================================== --- trunk/strcasecmp.c (revision 0) +++ trunk/strcasecmp.c (revision 3) @@ -0,0 +1,28 @@ +/* strcasecmp.c + * + */ + +/* Written by Niels Möller <nisse(a)lysator.liu.se> + * + * This file is hereby placed in the public domain. + */ + +#include <ctype.h> + +int strcasecmp(const char *s1, const char *s2) +{ + unsigned i; + + for (i = 0; s1[i] && s2[i]; i++) + { + unsigned char c1 = tolower( (unsigned char) s1[i]); + unsigned char c2 = tolower( (unsigned char) s2[i]); + + if (c1 < c2) + return -1; + else if (c1 > c2) + return 1; + } + + return !s2[i] - !s1[i]; +} Index: trunk/argp-test.c =================================================================== --- trunk/argp-test.c (revision 2) +++ trunk/argp-test.c (revision 3) @@ -1,5 +1,5 @@ /* Test program for argp argument parser - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 Index: trunk/argp-ba.c =================================================================== --- trunk/argp-ba.c (revision 2) +++ trunk/argp-ba.c (revision 3) @@ -1,5 +1,5 @@ /* Default definition for ARGP_PROGRAM_BUG_ADDRESS. - Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2004, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* If set by the user program, it should point to string that is the bug-reporting address for the program. It will be printed by argp_help if Property changes on: trunk/build-aux ___________________________________________________________________ Name: svn:ignore + depcomp missing config.guess ltmain.sh config.sub install-sh Index: trunk/argp-pv.c =================================================================== --- trunk/argp-pv.c (revision 2) +++ trunk/argp-pv.c (revision 3) @@ -1,5 +1,5 @@ /* Default definition for ARGP_PROGRAM_VERSION. - Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2004, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* If set by the user program to a non-zero value, then a default option --version is added (unless the ARGP_NO_HELP flag is used), which will Index: trunk/argp-help.c =================================================================== --- trunk/argp-help.c (revision 2) +++ trunk/argp-help.c (revision 3) @@ -1,5 +1,5 @@ /* Hierarchial argument parsing help output - Copyright (C) 1995,96,97,98,99,2000, 2003 Free Software Foundation, Inc. + Copyright (C) 96, 97, 98, 99, 1995, 2000, 2003, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 @@ -47,8 +47,10 @@ #include <assert.h> #include <stdarg.h> #include <ctype.h> -/* Does any system still need malloc.h? If so, we'd need a configure - test. */ +#if HAVE_MALLOC_H +/* Needed, for alloca on windows */ +# include <malloc.h> +#endif #ifndef _ /* This is for other GNU distributions with internationalized messages. */ @@ -102,6 +104,10 @@ char *strchrnul(const char *s, int c); # endif /* !HAVE_STRCHRNUL */ +# if !HAVE_STRCASECMP +int strcasecmp(const char *s1, const char *s2); +#endif + #endif /* !_LIBC */ Index: trunk/argp-eexst.c =================================================================== --- trunk/argp-eexst.c (revision 2) +++ trunk/argp-eexst.c (revision 3) @@ -1,5 +1,5 @@ /* Default definition for ARGP_ERR_EXIT_STATUS - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,14 +15,18 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif +#if HAVE_SYSEXITS_H #include <sysexits.h> +#else +# define EX_USAGE 64 +#endif #include "argp.h" Index: trunk/configure.ac =================================================================== --- trunk/configure.ac (revision 2) +++ trunk/configure.ac (revision 3) @@ -3,8 +3,8 @@ dnl This configure.ac is only for building a standalone argp library. AC_PREREQ(2.54) AC_INIT(argp-ba.c) -AC_CONFIG_AUX_DIR([../build-aux]) -AM_INIT_AUTOMAKE(argp, standalone-1.3) +AC_CONFIG_AUX_DIR([build-aux]) +AM_INIT_AUTOMAKE(argp, standalone-1.4) AM_CONFIG_HEADER(config.h) # GNU libc defaults to supplying the ISO C library functions only. The @@ -20,14 +20,14 @@ AM_PROG_CC_STDC if test "x$am_cv_prog_cc_stdc" = xno ; then - AC_ERROR([the C compiler doesn't handle ANSI-C]) + AC_ERROR([the C compiler does not handle ANSI-C]) fi # Checks for libraries. # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(limits.h malloc.h unistd.h) +AC_CHECK_HEADERS(limits.h malloc.h unistd.h sysexits.h stdarg.h) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -39,16 +39,16 @@ # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_VPRINTF -AC_CHECK_FUNCS(strerror) +AC_CHECK_FUNCS(strerror sleep getpid snprintf) -AC_REPLACE_FUNCS(mempcpy strndup strchrnul) +AC_REPLACE_FUNCS(mempcpy strndup strchrnul strcasecmp vsnprintf) dnl ARGP_CHECK_FUNC(includes, function-call [, if-found [, if-not-found]]) AC_DEFUN([ARGP_CHECK_FUNC], [AS_VAR_PUSHDEF([ac_func], m4_substr([$2], 0, m4_index([$2], [(]))) AS_VAR_PUSHDEF([ac_var], [ac_cv_func_call_]ac_func) AH_TEMPLATE(AS_TR_CPP(HAVE_[]ac_func), - [Define to 1 if you have the `]ac_func[' function.]) + [Define to 1 if you have the ]ac_func[ function.]) AC_CACHE_CHECK([for $2], ac_var, [AC_TRY_LINK([$1], [$2], [AS_VAR_SET(ac_var, yes)], Index: trunk/argp-pvh.c =================================================================== --- trunk/argp-pvh.c (revision 2) +++ trunk/argp-pvh.c (revision 3) @@ -1,5 +1,5 @@ /* Default definition for ARGP_PROGRAM_VERSION_HOOK. - Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2004, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> Index: trunk/argp-namefrob.h =================================================================== --- trunk/argp-namefrob.h (revision 2) +++ trunk/argp-namefrob.h (revision 3) @@ -1,5 +1,5 @@ /* Name frobnication for compiling argp outside of glibc - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #if !_LIBC /* This code is written for inclusion in gnu-libc, and uses names in the Index: trunk/Makefile.am =================================================================== --- trunk/Makefile.am (revision 2) +++ trunk/Makefile.am (revision 3) @@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = . testsuite -ACLOCAL_AMFLAGS = -I ../build-aux +ACLOCAL_AMFLAGS = -I build-aux noinst_LTLIBRARIES = libargp.la noinst_PROGRAMS = argp-test @@ -28,7 +28,6 @@ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions -# Leaves out argp-fs-xinl.c and argp-xinl.c libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \ argp-help.c argp-parse.c argp-pv.c \ argp-pvh.c Index: trunk/argp-fmtstream.c =================================================================== --- trunk/argp-fmtstream.c (revision 2) +++ trunk/argp-fmtstream.c (revision 3) @@ -1,5 +1,5 @@ /* Word-wrapping and line-truncating streams - Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2001, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles(a)gnu.ai.mit.edu>. @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* This package emulates glibc `line_wrap_stream' semantics for systems that don't have that. */ Index: trunk/vsnprintf.c =================================================================== --- trunk/vsnprintf.c (revision 0) +++ trunk/vsnprintf.c (revision 3) @@ -0,0 +1,833 @@ +/* + * Copyright Patrick Powell 1995 + * This code is based on code written by Patrick Powell (papowell(a)astart.com) + * It may be used for any purpose as long as this notice remains intact + * on all source code distributions + */ + +/************************************************************** + * Original: + * Patrick Powell Tue Apr 11 09:48:21 PDT 1995 + * A bombproof version of doprnt (dopr) included. + * Sigh. This sort of thing is always nasty do deal with. Note that + * the version here does not include floating point... + * + * snprintf() is used instead of sprintf() as it does limit checks + * for string length. This covers a nasty loophole. + * + * The other functions are there to prevent NULL pointers from + * causing nast effects. + * + * More Recently: + * Brandon Long <blong(a)fiction.net> 9/15/96 for mutt 0.43 + * This was ugly. It is still ugly. I opted out of floating point + * numbers, but the formatter understands just about everything + * from the normal C string format, at least as far as I can tell from + * the Solaris 2.5 printf(3S) man page. + * + * Brandon Long <blong(a)fiction.net> 10/22/97 for mutt 0.87.1 + * Ok, added some minimal floating point support, which means this + * probably requires libm on most operating systems. Don't yet + * support the exponent (e,E) and sigfig (g,G). Also, fmtint() + * was pretty badly broken, it just wasn't being exercised in ways + * which showed it, so that's been fixed. Also, formated the code + * to mutt conventions, and removed dead code left over from the + * original. Also, there is now a builtin-test, just compile with: + * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm + * and run snprintf for results. + * + * Thomas Roessler <roessler(a)guug.de> 01/27/98 for mutt 0.89i + * The PGP code was using unsigned hexadecimal formats. + * Unfortunately, unsigned formats simply didn't work. + * + * Michael Elkins <me(a)cs.hmc.edu> 03/05/98 for mutt 0.90.8 + * The original code assumed that both snprintf() and vsnprintf() were + * missing. Some systems only have snprintf() but not vsnprintf(), so + * the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF. + * + * Andrew Tridgell (tridge(a)samba.org) Oct 1998 + * fixed handling of %.0f + * added test for HAVE_LONG_DOUBLE + * + * Russ Allbery <rra(a)stanford.edu> 2000-08-26 + * fixed return value to comply with C99 + * fixed handling of snprintf(NULL, ...) + * + **************************************************************/ + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) + +#include <string.h> +#include <ctype.h> +#include <sys/types.h> + +/* Define this as a fall through, HAVE_STDARG_H is probably already set */ + +#define HAVE_VARARGS_H + + +/* varargs declarations: */ + +#if defined(HAVE_STDARG_H) +# include <stdarg.h> +# define HAVE_STDARGS /* let's hope that works everywhere (mj) */ +# define VA_LOCAL_DECL va_list ap +# define VA_START(f) va_start(ap, f) +# define VA_SHIFT(v,t) ; /* no-op for ANSI */ +# define VA_END va_end(ap) +#else +# if defined(HAVE_VARARGS_H) +# include <varargs.h> +# undef HAVE_STDARGS +# define VA_LOCAL_DECL va_list ap +# define VA_START(f) va_start(ap) /* f is ignored! */ +# define VA_SHIFT(v,t) v = va_arg(ap,t) +# define VA_END va_end(ap) +# else +/*XX ** NO VARARGS ** XX*/ +# endif +#endif + +#ifdef HAVE_LONG_DOUBLE +#define LDOUBLE long double +#else +#define LDOUBLE double +#endif + +int snprintf (char *str, size_t count, const char *fmt, ...); +int vsnprintf (char *str, size_t count, const char *fmt, va_list arg); + +static int dopr (char *buffer, size_t maxlen, const char *format, + va_list args); +static int fmtstr (char *buffer, size_t *currlen, size_t maxlen, + char *value, int flags, int min, int max); +static int fmtint (char *buffer, size_t *currlen, size_t maxlen, + long value, int base, int min, int max, int flags); +static int fmtfp (char *buffer, size_t *currlen, size_t maxlen, + LDOUBLE fvalue, int min, int max, int flags); +static int dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c ); + +/* + * dopr(): poor man's version of doprintf + */ + +/* format read states */ +#define DP_S_DEFAULT 0 +#define DP_S_FLAGS 1 +#define DP_S_MIN 2 +#define DP_S_DOT 3 +#define DP_S_MAX 4 +#define DP_S_MOD 5 +#define DP_S_CONV 6 +#define DP_S_DONE 7 + +/* format flags - Bits */ +#define DP_F_MINUS (1 << 0) +#define DP_F_PLUS (1 << 1) +#define DP_F_SPACE (1 << 2) +#define DP_F_NUM (1 << 3) +#define DP_F_ZERO (1 << 4) +#define DP_F_UP (1 << 5) +#define DP_F_UNSIGNED (1 << 6) + +/* Conversion Flags */ +#define DP_C_SHORT 1 +#define DP_C_LONG 2 +#define DP_C_LDOUBLE 3 + +#define char_to_int(p) (p - '0') +#define MAX(p,q) ((p >= q) ? p : q) +#define MIN(p,q) ((p <= q) ? p : q) + +static int dopr (char *buffer, size_t maxlen, const char *format, va_list args) +{ + unsigned char ch; + long value; + LDOUBLE fvalue; + char *strvalue; + int min; + int max; + int state; + int flags; + int cflags; + int total; + size_t currlen; + + state = DP_S_DEFAULT; + currlen = flags = cflags = min = 0; + max = -1; + ch = *format++; + total = 0; + + while (state != DP_S_DONE) + { + if (ch == '\0') + state = DP_S_DONE; + + switch(state) + { + case DP_S_DEFAULT: + if (ch == '%') + state = DP_S_FLAGS; + else + total += dopr_outch (buffer, &currlen, maxlen, ch); + ch = *format++; + break; + case DP_S_FLAGS: + switch (ch) + { + case '-': + flags |= DP_F_MINUS; + ch = *format++; + break; + case '+': + flags |= DP_F_PLUS; + ch = *format++; + break; + case ' ': + flags |= DP_F_SPACE; + ch = *format++; + break; + case '#': + flags |= DP_F_NUM; + ch = *format++; + break; + case '0': + flags |= DP_F_ZERO; + ch = *format++; + break; + default: + state = DP_S_MIN; + break; + } + break; + case DP_S_MIN: + if (isdigit(ch)) + { + min = 10*min + char_to_int (ch); + ch = *format++; + } + else if (ch == '*') + { + min = va_arg (args, int); + ch = *format++; + state = DP_S_DOT; + } + else + state = DP_S_DOT; + break; + case DP_S_DOT: + if (ch == '.') + { + state = DP_S_MAX; + ch = *format++; + } + else + state = DP_S_MOD; + break; + case DP_S_MAX: + if (isdigit(ch)) + { + if (max < 0) + max = 0; + max = 10*max + char_to_int (ch); + ch = *format++; + } + else if (ch == '*') + { + max = va_arg (args, int); + ch = *format++; + state = DP_S_MOD; + } + else + state = DP_S_MOD; + break; + case DP_S_MOD: + /* Currently, we don't support Long Long, bummer */ + switch (ch) + { + case 'h': + cflags = DP_C_SHORT; + ch = *format++; + break; + case 'l': + cflags = DP_C_LONG; + ch = *format++; + break; + case 'L': + cflags = DP_C_LDOUBLE; + ch = *format++; + break; + default: + break; + } + state = DP_S_CONV; + break; + case DP_S_CONV: + switch (ch) + { + case 'd': + case 'i': + if (cflags == DP_C_SHORT) + value = (short) va_arg (args, int); + else if (cflags == DP_C_LONG) + value = va_arg (args, long int); + else + value = va_arg (args, int); + total += fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); + break; + case 'o': + flags |= DP_F_UNSIGNED; + if (cflags == DP_C_SHORT) + value = (unsigned short) va_arg (args, unsigned); + else if (cflags == DP_C_LONG) + value = va_arg (args, unsigned long int); + else + value = va_arg (args, unsigned int); + total += fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags); + break; + case 'u': + flags |= DP_F_UNSIGNED; + if (cflags == DP_C_SHORT) + value = (unsigned short) va_arg (args, unsigned); + else if (cflags == DP_C_LONG) + value = va_arg (args, unsigned long int); + else + value = va_arg (args, unsigned int); + total += fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); + break; + case 'X': + flags |= DP_F_UP; + case 'x': + flags |= DP_F_UNSIGNED; + if (cflags == DP_C_SHORT) + value = (unsigned short) va_arg (args, unsigned); + else if (cflags == DP_C_LONG) + value = va_arg (args, unsigned long int); + else + value = va_arg (args, unsigned int); + total += fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags); + break; + case 'f': + if (cflags == DP_C_LDOUBLE) + fvalue = va_arg (args, LDOUBLE); + else + fvalue = va_arg (args, double); + /* um, floating point? */ + total += fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags); + break; + case 'E': + flags |= DP_F_UP; + case 'e': + if (cflags == DP_C_LDOUBLE) + fvalue = va_arg (args, LDOUBLE); + else + fvalue = va_arg (args, double); + break; + case 'G': + flags |= DP_F_UP; + case 'g': + if (cflags == DP_C_LDOUBLE) + fvalue = va_arg (args, LDOUBLE); + else + fvalue = va_arg (args, double); + break; + case 'c': + total += dopr_outch (buffer, &currlen, maxlen, va_arg (args, int)); + break; + case 's': + strvalue = va_arg (args, char *); + total += fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max); + break; + case 'p': + strvalue = va_arg (args, void *); + total += fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, + max, flags); + break; + case 'n': + if (cflags == DP_C_SHORT) + { + short int *num; + num = va_arg (args, short int *); + *num = currlen; + } + else if (cflags == DP_C_LONG) + { + long int *num; + num = va_arg (args, long int *); + *num = currlen; + } + else + { + int *num; + num = va_arg (args, int *); + *num = currlen; + } + break; + case '%': + total += dopr_outch (buffer, &currlen, maxlen, ch); + break; + case 'w': + /* not supported yet, treat as next char */ + ch = *format++; + break; + default: + /* Unknown, skip */ + break; + } + ch = *format++; + state = DP_S_DEFAULT; + flags = cflags = min = 0; + max = -1; + break; + case DP_S_DONE: + break; + default: + /* hmm? */ + break; /* some picky compilers need this */ + } + } + if (buffer != NULL) + { + if (currlen < maxlen - 1) + buffer[currlen] = '\0'; + else + buffer[maxlen - 1] = '\0'; + } + return total; +} + +static int fmtstr (char *buffer, size_t *currlen, size_t maxlen, + char *value, int flags, int min, int max) +{ + int padlen, strln; /* amount to pad */ + int cnt = 0; + int total = 0; + + if (value == 0) + { + value = "<NULL>"; + } + + for (strln = 0; value[strln]; ++strln); /* strlen */ + if (max >= 0 && max < strln) + strln = max; + padlen = min - strln; + if (padlen < 0) + padlen = 0; + if (flags & DP_F_MINUS) + padlen = -padlen; /* Left Justify */ + + while (padlen > 0) + { + total += dopr_outch (buffer, currlen, maxlen, ' '); + --padlen; + } + while (*value && ((max < 0) || (cnt < max))) + { + total += dopr_outch (buffer, currlen, maxlen, *value++); + ++cnt; + } + while (padlen < 0) + { + total += dopr_outch (buffer, currlen, maxlen, ' '); + ++padlen; + } + return total; +} + +/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ + +static int fmtint (char *buffer, size_t *currlen, size_t maxlen, + long value, int base, int min, int max, int flags) +{ + int signvalue = 0; + unsigned long uvalue; + char convert[20]; + int place = 0; + int spadlen = 0; /* amount to space pad */ + int zpadlen = 0; /* amount to zero pad */ + int caps = 0; + int total = 0; + + if (max < 0) + max = 0; + + uvalue = value; + + if(!(flags & DP_F_UNSIGNED)) + { + if( value < 0 ) { + signvalue = '-'; + uvalue = -value; + } + else + if (flags & DP_F_PLUS) /* Do a sign (+/i) */ + signvalue = '+'; + else + if (flags & DP_F_SPACE) + signvalue = ' '; + } + + if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ + + do { + convert[place++] = + (caps? "0123456789ABCDEF":"0123456789abcdef") + [uvalue % (unsigned)base ]; + uvalue = (uvalue / (unsigned)base ); + } while(uvalue && (place < 20)); + if (place == 20) place--; + convert[place] = 0; + + zpadlen = max - place; + spadlen = min - MAX (max, place) - (signvalue ? 1 : 0); + if (zpadlen < 0) zpadlen = 0; + if (spadlen < 0) spadlen = 0; + if (flags & DP_F_ZERO) + { + zpadlen = MAX(zpadlen, spadlen); + spadlen = 0; + } + if (flags & DP_F_MINUS) + spadlen = -spadlen; /* Left Justifty */ + +#ifdef DEBUG_SNPRINTF + dprint (1, (debugfile, "zpad: %d, spad: %d, min: %d, max: %d, place: %d\n", + zpadlen, spadlen, min, max, place)); +#endif + + /* Spaces */ + while (spadlen > 0) + { + total += dopr_outch (buffer, currlen, maxlen, ' '); + --spadlen; + } + + /* Sign */ + if (signvalue) + total += dopr_outch (buffer, currlen, maxlen, signvalue); + + /* Zeros */ + if (zpadlen > 0) + { + while (zpadlen > 0) + { + total += dopr_outch (buffer, currlen, maxlen, '0'); + --zpadlen; + } + } + + /* Digits */ + while (place > 0) + total += dopr_outch (buffer, currlen, maxlen, convert[--place]); + + /* Left Justified spaces */ + while (spadlen < 0) { + total += dopr_outch (buffer, currlen, maxlen, ' '); + ++spadlen; + } + + return total; +} + +static LDOUBLE abs_val (LDOUBLE value) +{ + LDOUBLE result = value; + + if (value < 0) + result = -value; + + return result; +} + +static LDOUBLE pow10 (int exp) +{ + LDOUBLE result = 1; + + while (exp) + { + result *= 10; + exp--; + } + + return result; +} + +static long round (LDOUBLE value) +{ + long intpart; + + intpart = value; + value = value - intpart; + if (value >= 0.5) + intpart++; + + return intpart; +} + +static int fmtfp (char *buffer, size_t *currlen, size_t maxlen, + LDOUBLE fvalue, int min, int max, int flags) +{ + int signvalue = 0; + LDOUBLE ufvalue; + char iconvert[20]; + char fconvert[20]; + int iplace = 0; + int fplace = 0; + int padlen = 0; /* amount to pad */ + int zpadlen = 0; + int caps = 0; + int total = 0; + long intpart; + long fracpart; + + /* + * AIX manpage says the default is 0, but Solaris says the default + * is 6, and sprintf on AIX defaults to 6 + */ + if (max < 0) + max = 6; + + ufvalue = abs_val (fvalue); + + if (fvalue < 0) + signvalue = '-'; + else + if (flags & DP_F_PLUS) /* Do a sign (+/i) */ + signvalue = '+'; + else + if (flags & DP_F_SPACE) + signvalue = ' '; + +#if 0 + if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */ +#endif + + intpart = ufvalue; + + /* + * Sorry, we only support 9 digits past the decimal because of our + * conversion method + */ + if (max > 9) + max = 9; + + /* We "cheat" by converting the fractional part to integer by + * multiplying by a factor of 10 + */ + fracpart = round ((pow10 (max)) * (ufvalue - intpart)); + + if (fracpart >= pow10 (max)) + { + intpart++; + fracpart -= pow10 (max); + } + +#ifdef DEBUG_SNPRINTF + dprint (1, (debugfile, "fmtfp: %f =? %d.%d\n", fvalue, intpart, fracpart)); +#endif + + /* Convert integer part */ + do { + iconvert[iplace++] = + (caps? "0123456789ABCDEF":"0123456789abcdef")[intpart % 10]; + intpart = (intpart / 10); + } while(intpart && (iplace < 20)); + if (iplace == 20) iplace--; + iconvert[iplace] = 0; + + /* Convert fractional part */ + do { + fconvert[fplace++] = + (caps? "0123456789ABCDEF":"0123456789abcdef")[fracpart % 10]; + fracpart = (fracpart / 10); + } while(fracpart && (fplace < 20)); + if (fplace == 20) fplace--; + fconvert[fplace] = 0; + + /* -1 for decimal point, another -1 if we are printing a sign */ + padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); + zpadlen = max - fplace; + if (zpadlen < 0) + zpadlen = 0; + if (padlen < 0) + padlen = 0; + if (flags & DP_F_MINUS) + padlen = -padlen; /* Left Justifty */ + + if ((flags & DP_F_ZERO) && (padlen > 0)) + { + if (signvalue) + { + total += dopr_outch (buffer, currlen, maxlen, signvalue); + --padlen; + signvalue = 0; + } + while (padlen > 0) + { + total += dopr_outch (buffer, currlen, maxlen, '0'); + --padlen; + } + } + while (padlen > 0) + { + total += dopr_outch (buffer, currlen, maxlen, ' '); + --padlen; + } + if (signvalue) + total += dopr_outch (buffer, currlen, maxlen, signvalue); + + while (iplace > 0) + total += dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]); + + /* + * Decimal point. This should probably use locale to find the correct + * char to print out. + */ + if (max > 0) + { + total += dopr_outch (buffer, currlen, maxlen, '.'); + + while (fplace > 0) + total += dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]); + } + + while (zpadlen > 0) + { + total += dopr_outch (buffer, currlen, maxlen, '0'); + --zpadlen; + } + + while (padlen < 0) + { + total += dopr_outch (buffer, currlen, maxlen, ' '); + ++padlen; + } + + return total; +} + +static int dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c) +{ + if (*currlen + 1 < maxlen) + buffer[(*currlen)++] = c; + return 1; +} + +#ifndef HAVE_VSNPRINTF +int vsnprintf (char *str, size_t count, const char *fmt, va_list args) +{ + if (str != NULL) + str[0] = 0; + return dopr(str, count, fmt, args); +} +#endif /* !HAVE_VSNPRINTF */ + +#ifndef HAVE_SNPRINTF +/* VARARGS3 */ +#ifdef HAVE_STDARGS +int snprintf (char *str,size_t count,const char *fmt,...) +#else +int snprintf (va_alist) va_dcl +#endif +{ +#ifndef HAVE_STDARGS + char *str; + size_t count; + char *fmt; +#endif + VA_LOCAL_DECL; + int total; + + VA_START (fmt); + VA_SHIFT (str, char *); + VA_SHIFT (count, size_t ); + VA_SHIFT (fmt, char *); + total = vsnprintf(str, count, fmt, ap); + VA_END; + return total; +} +#endif /* !HAVE_SNPRINTF */ + +#ifdef TEST_SNPRINTF +#ifndef LONG_STRING +#define LONG_STRING 1024 +#endif +int main (void) +{ + char buf1[LONG_STRING]; + char buf2[LONG_STRING]; + char *fp_fmt[] = { + "%-1.5f", + "%1.5f", + "%123.9f", + "%10.5f", + "% 10.5f", + "%+22.9f", + "%+4.9f", + "%01.3f", + "%4f", + "%3.1f", + "%3.2f", + "%.0f", + "%.1f", + NULL + }; + double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, + 0.9996, 1.996, 4.136, 0}; + char *int_fmt[] = { + "%-1.5d", + "%1.5d", + "%123.9d", + "%5.5d", + "%10.5d", + "% 10.5d", + "%+22.33d", + "%01.3d", + "%4d", + NULL + }; + long int_nums[] = { -1, 134, 91340, 341, 0203, 0}; + int x, y; + int fail = 0; + int num = 0; + + printf ("Testing snprintf format codes against system sprintf...\n"); + + for (x = 0; fp_fmt[x] != NULL ; x++) + for (y = 0; fp_nums[y] != 0 ; y++) + { + snprintf (buf1, sizeof (buf1), fp_fmt[x], fp_nums[y]); + sprintf (buf2, fp_fmt[x], fp_nums[y]); + if (strcmp (buf1, buf2)) + { + printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf = %s\n", + fp_fmt[x], buf1, buf2); + fail++; + } + num++; + } + + for (x = 0; int_fmt[x] != NULL ; x++) + for (y = 0; int_nums[y] != 0 ; y++) + { + snprintf (buf1, sizeof (buf1), int_fmt[x], int_nums[y]); + sprintf (buf2, int_fmt[x], int_nums[y]); + if (strcmp (buf1, buf2)) + { + printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf = %s\n", + int_fmt[x], buf1, buf2); + fail++; + } + num++; + } + printf ("%d tests failed out of %d.\n", fail, num); +} +#endif /* SNPRINTF_TEST */ + +#endif /* !HAVE_SNPRINTF */ Index: trunk/bootstrap =================================================================== --- trunk/bootstrap (revision 0) +++ trunk/bootstrap (revision 3) @@ -0,0 +1,3 @@ +#! /bin/sh + +autoreconf --force --verbose --install Property changes on: trunk/bootstrap ___________________________________________________________________ Name: svn:eol-style + native Name: svn:executable + * Index: trunk/argp-xinl.c (deleted) =================================================================== Index: trunk/argp-fs-xinl.c (deleted) =================================================================== Property changes on: trunk ___________________________________________________________________ Name: svn:ignore + _build configure INSTALL COPYING config.h.in autom4te.cache aclocal.m4 -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "On a long enough timeline, the survival rate /EPITA\ Promo 2008.CSI/ACU/YAKA for everyone drops to zero" -- Jack.

17 years, 11 months

Re: [Projects] 2: Original creation of argp/.

by Akim Demaille

>>> "BP" == Benoit Perrot <benoit(a)lrde.epita.fr> writes: > Heummmm ... Par pure curiosité : je peux demander pourquoi ? :) > (On compterais le maintenir ? ;) Je pensais qu'il y avait un problème de portabilité, mais c'était un problème de distcc. Comme il est utilisé par tc et vaucanson, ça méritait son propre dépôt. De toutes façons les warnings commencent à me souler, si qq'1 pouvait s'en charger, ce serait cool.

17 years, 11 months

Re: [Olena-patches] r719: Fix some tests.

by Roland Levillain

Tsuna <tsuna(a)warszawa.lrde.epita.fr> writes: > On 2007-01-30, Roland Levillain <roland(a)lrde.epita.fr> wrote: [...] >> I suppose `mailto' is a Subversion property used by svn-wrapper to >> store the address of a mailing-list. In that case, I suggest using a >> prefix, to avoid name clashes, as Subversion does for its own >> properties (e.g. svn:externals). What about `svn-wrapper:mailto' or >> even `svn-wrap:mailto'? > or even svnw:mailto ? Yes, why not. > I don't know, properties are so rarely used that I thought that a pain > `mailto' would be easier to use. Have you ever set a property whose > name didn't start with `svn:'? No, but the names of SVK properties start with `svk:', which makes me think that using prefixes really is the Right Way To Do It.

17 years, 11 months

Re: [Olena-patches] r719: Fix some tests.

by Roland Levillain

Thomas Moulard <thomas.moulard(a)lrde.epita.fr> writes: > URL: https://svn.lrde.epita.fr/svn/oln/trunk/static > > ChangeLog: > 2007-01-11 Thomas Moulard <thomas.moulard(a)lrde.epita.fr> > > Fix some tests. > * tests/vtypes-and-exact.cc: Fix macro. > * tests/vtypes.cc: Fix macro. > > vtypes-and-exact.cc | 2 +- > vtypes.cc | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > > Property changes on: . > ___________________________________________________________________ > Name: mailto > + olena-patches(a)lrde.epita.fr I suppose `mailto' is a Subversion property used by svn-wrapper to store the address of a mailing-list. In that case, I suggest using a prefix, to avoid name clashes, as Subversion does for its own properties (e.g. svn:externals). What about `svn-wrapper:mailto' or even `svn-wrap:mailto'?

17 years, 11 months

Breakfast in Bed Coupon

by Gates Q. Moll

17 years, 11 months

Times Are Hard, I Luv U

by Wallace Newsome

17 years, 11 months

President of Russia Putin dead.

by Victor Preston

17 years, 11 months

XRM r106: Fix binary distributions.

by SIGOURE Benoit

URL: https://svn.lrde.epita.fr/svn/xrm/trunk ChangeLog: 2007-01-20 SIGOURE Benoit <tsuna(a)lrde.epita.fr> Fix binary distributions. Binary distributions were incomplete because files under /nix were not included. * bin-dist.sh: Use relocate_xtc_repos.pl to make XTC repositories relocatable. * relocate_xtc_repos.pl: New. Handle inclusions of XTC repositories and files under /nix. bin-dist.sh | 44 ++++++++++++- relocate_xtc_repos.pl | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++ vcs/xrm.rb | 2 3 files changed, 201 insertions(+), 5 deletions(-) Index: bin-dist.sh =================================================================== --- bin-dist.sh (revision 105) +++ bin-dist.sh (working copy) @@ -1,5 +1,25 @@ #! /bin/sh # Generate a binary distribution of XRM. +# Copyright (C) 2007 Benoit Sigoure. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# or the GNU Lesser General Public License as published by the +# Free Software Foundation; either version 2.1 of the +# GNU Lesser General Public License or version 2 of the +# GNU General Public License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License or the GNU Lesser General Public License +# for more details. +# +# You should have received a copy of either the GNU General Public +# License or the GNU Lesser General Public License along with this +# program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA me=`basename "$0"` abort() @@ -27,19 +47,35 @@ make all install LDFLAGS='-all-static' || abort 'Compilation failed' +mkdir _inst/share/nix || abort 'Could not create the nix directory' +chmod 755 _inst/share/nix || abort 'Could not set rights of the nix dir' + : ${DEFAULT_XTC_REPOS=:} echo '>>> Replacing and fixing binary XTC repositories with plain-text' cd _inst || abort 'Cannot cd to _inst' + +# Now we need to remove all absolute paths from the XTC repository. Some of +# them are easy to remove because they have just been copied by make install +# and we now the prefix we used for that very make install. Now we also have +# to deal with paths pointing to the Nix store (/nix/store) because we can't +# assume the user will also have that installed (obviously...). The problem is +# that an XTC repository can import another and this is what typically +# happens: your project creates an XTC repos, registers its tools and imports +# Stratego/XT's repos. +# We thus need to handle (recursively) the fact that an XTC repos might import +# another which will in turn bring many new files in the binary distribution +# and potentially other XTC repositories. This work is done by +# relocate_xtc_repos.pl. + for f in : `find share -type f -name XTC`; do test x"$f" = x: && continue echo -n " $f: " - mv "$f" "$f.bin" || abort "Failed to rename '$f'" - pp-aterm -i "$f.bin" -o "$f.tmp" || abort "pp-aterm failed on '$f.bin'" - sed "s,$prefix,@prefix@,g" "$f.tmp" >"$f" || abort "Failed to sed '$f.tmp'" + ../relocate_xtc_repos.pl "$prefix" "$f.tmp" >"$f" rm -f "$f.tmp" echo 'OK' test x"$DEFAULT_XTC_REPOS" = x: && DEFAULT_XTC_REPOS=$f done + cd .. || abort 'Cannot cd ..' echo ">>> Hooking binary programs with shell scripts @@ -71,6 +107,6 @@ echo 'OK' mv $tarname.tar.{gz,bz2} .. || abort 'Failed to move tarballs' cd .. || abort 'Failed to cd back to parent directory' -rm -rf _static || abort 'Failed to clean the _static directory' +#rm -rf _static || abort 'Failed to clean the _static directory' echo "Binary distribution ready in $tarname.tar.gz and $tarname.tar.bz2" Index: vcs/xrm.rb =================================================================== --- vcs/xrm.rb (revision 105) +++ vcs/xrm.rb (working copy) @@ -7,7 +7,7 @@ def xrm_commit! ( *args ) common_commit!("XRM <%= rev %>: <%= title %>", *args) do |subject| - mail!(:to => %w[projects(a)lrde.epita.fr], :subject => subject) + mail!(:to => %w[xrm-patches(a)lrde.epita.fr], :subject => subject) end end alias_command :xrmci, :xrm_commit Index: relocate_xtc_repos.pl =================================================================== --- relocate_xtc_repos.pl (revision 0) +++ relocate_xtc_repos.pl (revision 0) @@ -0,0 +1,160 @@ +#! /usr/bin/perl -w +# Make Stratego XTC repositories relocatable. +# Copyright (C) 2007 Benoit Sigoure. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# or the GNU Lesser General Public License as published by the +# Free Software Foundation; either version 2.1 of the +# GNU Lesser General Public License or version 2 of the +# GNU General Public License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License or the GNU Lesser General Public License +# for more details. +# +# You should have received a copy of either the GNU General Public +# License or the GNU Lesser General Public License along with this +# program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +use strict; +use IO::File; +use File::Copy; +use File::Path; +use File::Basename; +use Getopt::Long; + +# Verbosity level: 0 = quiet, 1 = notice, 2 = verbose, 3 = debug. +my $verbosity = 1; + +sub usage() +{ + print <<EOF; +Usage: relocate_xtc_repos.pl [OPTIONS] <prefix> <XTC> +Make Stratego XTC repositories relocatable. + +Options: + -h, --help: This message. + -q, --quiet: Don't print informational messages on stderr. + -v, --verbose: Be more verbose. Pass it more than once to increase + verbosity level. + +Copyright (C) 2007 Benoit Sigoure. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +EOF + exit 0; +} + +usage if $#ARGV != 1; + +my $prefix = $ARGV[0]; + +# Prototypes. +sub copy_from_nix($$); +sub make_xtc_repos_relocatable($); + +# ------------ # +# Helper subs. # +# ------------ # + +sub notice($) +{ + print STDERR shift if $verbosity >= 1; +} + +sub verbose($) +{ + print STDERR shift if $verbosity >= 2; +} + +sub debug($) +{ + print STDERR shift if $verbosity >= 3; +} + +sub copy_from_nix($$) +{ + my ($from, $to) = @_; + my $dir = dirname ($to . $from); + + verbose "Copying '$from' to '$to'\n"; + + verbose "Skipping '$from' (No such file).\n" if ! -f $from; + return 0 if ! -f $from; + + mkpath $dir + or die "Failed to create directory tree '" . $dir . "': $!" + unless -d $dir; + + copy $from, $to . $from or die "Failed to copy '$from' to '$to$from': $!"; + return 1; +} + +sub make_xtc_repos_relocatable($) +{ + local $_; + # Path to the XTC repos we're working on. + my $xtc = shift; + # XTC repos imported by $xtc. We'll deal with then once we're finished with + # $xtc. + my @xtc_repositories_imported; + + notice "Relocating $xtc\n"; + + # Pretty-print the XTC repository in full text ATerm. + move $xtc, "$xtc.bin" or die "Could not rename $xtc: $!"; + print `pp-aterm -i '$xtc.bin' -o '$xtc'`; + die "pp-aterm failed and returned " . ($? >> 8) if $? >> 8 != 0; + + my $in = new IO::File($xtc) + or die "Failed to open $xtc for reading: $!"; + my $out = new IO::File(">$xtc.tmp") + or die "Failed to open $xtc.tmp for writting: $!"; + + while ($_ = $in->getline()) + { + debug "Examinating $_"; + s{$prefix}{\@prefix@}o; + copy_from_nix $1, '_inst/share' if m{$(?:Tool|Import)\(.*?"(/nix/[^"]+)"}; + push(@xtc_repositories_imported, "_inst/share$1") + if /\(Import\($, \["([^"]+)"\]\)/; + s{"/nix}{"\@prefix@/share/nix}; + $out->print($_); + } + + $in->close() or die "Failed to close $xtc: $!"; + move "$xtc.tmp", $xtc or die "Could not overwrite $xtc: $!"; + notice "Relocated $xtc\n"; + + # Now make the XTC repos imported by $xtc relocatable. + map { make_xtc_repos_relocatable $_ } @xtc_repositories_imported; +} + +# ----- # +# Main. # +# ----- # + +Getopt::Long::config ("bundling", "pass_through"); +Getopt::Long::GetOptions +( + 'h|help' => sub { usage }, + 'q|quiet' => sub { $verbosity = 0 }, + 'v|verbose' => sub { ++$verbosity; }, +) or die; + +foreach my $arg (@ARGV) +{ + if ($arg =~ /^-./) + { + print STDERR "$0: unrecognized option `$arg'\n"; + print STDERR "Try `$0 --help' for more information.\n"; + exit 1; + } +} + +make_xtc_repos_relocatable $ARGV[1]; Property changes on: relocate_xtc_repos.pl ___________________________________________________________________ Name: svn:executable + * -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "On a long enough timeline, the survival rate /EPITA\ Promo 2008.CSI/ACU/YAKA for everyone drops to zero" -- Jack.

17 years, 11 months

Robert Horne Group markets a wide range of paper, boards and plastic substrates.

by Livingston W. Arabella

The extension and the associated increase in warehouse capacity will allow AMAG to meet the increasing demand for automotive spare parts. Through SupplyWEB, suppliers can receive their forecast and daily requirements and send ASNs. Over the following few weeks, further adjustments and customisation took place as required via email and phone conversation between Kenny Falconer and RMS. Trials are proving that the technology is becoming robust and more reliable and will be able to drive future automation. In any of the above scenarios, scheduling software is a must. While consumer demand continues to hold steady, deflation has gripped prices for five years now and looks set to continue in most categories. Wal-Mart commissions Swisslog to build two more distribution centres - LogisticsIT. Manufacturers either rely on external suppliers on a daily basis or divisions of its own enterprise to deliver materials. " Each production cell is then driven by its work-to list. While many companies have invested wisely in philosophies, software and systems to control materials, capacity often takes something of a back seat. 5, a Web-based supply chain management and execution solution. Because the entire Vantage solution streamlines the order cycle, an enterprise can maximize its resources, minimize its costs and improve profitability. First, know your options. Once set, only returns falling within the established parameters are authorised to be accepted. There are many options that will help you match what you need to track and what you are prepared to outlay. However, for many suppliers, the case for RFID is less certain, and relies on benefits claimed to result from improved supply chain collaboration, forecasting and demand management. Secondly, it must have a supply or timely delivery of raw materials or components to meet this demand. This is where a scheduling software solution can prove to be an invaluable investment and, additionally, something that can deliver a rapid ROI. Turnaround time can mean the difference between profit and loss, especially with time-sensitive items. This includes labour and refurbishment. We needed a system that would support us to improve further on this success. Retailers are embarking on more and more RFID trials but are unsure about how to relate these to improved business performance and get commitment to make RFID trials a reality. To succeed in this environment, you need intuitive, accessible software solutions that provide you with the real-time information necessary for informed, bottom-line enhancing decisions. Its customers are mainly in the USA, Europe and Asia, highlighting its worldwide presence. This sets a constraint on the 24 project managers who in the past would bend things to have resources dedicated to their urgent project needs. DS Collaborate Streamlines, Accelerates Business Planning - LogisticsIT. RFID and forecasting: Where's the benefit? A Handheld Designed for Your Hazardous Environment - LogisticsIT.

17 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects