Overview
Comment: | Win32 support fixed. Added a new man page (lc_cleanup) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
80d18a8d82e7ff601f9bc170b2b5b476 |
User & Date: | rkeene on 2004-12-18 10:05:59 |
Other Links: | manifest | tags |
Context
2004-12-18
| ||
10:46 | Win32 fixes. libconfig 0.1.8 check-in: 5baa5c16a6 user: rkeene tags: 0.1.8, trunk | |
10:05 | Win32 support fixed. Added a new man page (lc_cleanup) check-in: 80d18a8d82 user: rkeene tags: trunk | |
2004-12-03
| ||
12:22 | Added an AUTHORS file. check-in: a3f979b75d user: rkeene tags: trunk | |
Changes
Modified Makefile.in from [452002dfb3] to [6d7f8667ba].
︙ | ︙ | |||
52 53 54 55 56 57 58 | cat $? | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ test-lc: $(LIBS) test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $?) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig .PHONY: clean distclean install clean: | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | cat $? | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ test-lc: $(LIBS) test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $?) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig .PHONY: clean distclean install clean: rm -f *.o $(BINS) $(LIBS) libconfig.h *~ test-lc *.dll.a *.dll.def *.dll distclean: clean rm -f Makefile config.h config.status config.log lc_geterrno.3 lc_process.3 lc_cleanup.3 lc_process_file.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 libconfig.3 install: all libconfig.h -$(INSTALL) -d $(mandir) -$(INSTALL) -d $(mandir)/man3 |
︙ | ︙ |
Added build/build_win32.sh version [295d16231e].
> > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | #! /bin/sh if [ ! -x configure ]; then cd ../; fi WIN32="${HOME}/root/windows-i386" CFLAGS="-I${WIN32}/include" CPPFLAGS="${CFLAGS}" LDFLAGS="-L${WIN32}/lib" DATE="`date +%Y%m%d%H%M`" CROSS=i586-mingw32msvc if [ ! -z "${CROSS}" ]; then CROSSCMD="${CROSS}-" fi export CFLAGS LDFLAGS CPPFLAGS make distclean ./configure --host=${CROSS} && \ make || exit 1 |
Modified compat.h from [cd6e5c8c4f] to [e7ac67c392].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | #include "win32.h" #endif #ifndef LC_LINEBUF_LEN #define LC_LINEBUF_LEN 1024 #endif #ifndef HAVE_STRTOLL #include "strtoll.h" #endif #ifndef HAVE_STRSEP #include "strsep.h" #endif #ifdef HAVE_INTTYPES_H | > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | #include "win32.h" #endif #ifndef LC_LINEBUF_LEN #define LC_LINEBUF_LEN 1024 #endif #ifndef HAVE_GETUID #include "getuid.h" #endif #ifndef HAVE_STRTOLL #include "strtoll.h" #endif #ifndef HAVE_STRSEP #include "strsep.h" #endif #ifdef HAVE_INTTYPES_H |
︙ | ︙ |
Modified config.h.in from [093c4e8a7f] to [105e0ec8a5].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `getpwuid' function. */ #undef HAVE_GETPWUID /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have fopen_net from libopennet */ #undef HAVE_LIBOPENNET | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `getpwuid' function. */ #undef HAVE_GETPWUID /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have fopen_net from libopennet */ #undef HAVE_LIBOPENNET |
︙ | ︙ |
Modified configure from [2dd96896d3] to [2142567030].
1 2 3 | #! /bin/sh # From configure.ac Revision . # Guess values for system-dependent variables and create Makefiles. | | | 1 2 3 4 5 6 7 8 9 10 11 | #! /bin/sh # From configure.ac Revision . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for libconfig 0.1.7. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## |
︙ | ︙ | |||
264 265 266 267 268 269 270 | # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME='libconfig' PACKAGE_TARNAME='libconfig' | | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME='libconfig' PACKAGE_TARNAME='libconfig' PACKAGE_VERSION='0.1.7' PACKAGE_STRING='libconfig 0.1.7' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #if HAVE_SYS_TYPES_H # include <sys/types.h> |
︙ | ︙ | |||
774 775 776 777 778 779 780 | # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF | | | 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 | # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF \`configure' configures libconfig 0.1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. |
︙ | ︙ | |||
835 836 837 838 839 840 841 | --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in | | | 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 | --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in short | recursive ) echo "Configuration of libconfig 0.1.7:";; esac cat <<\_ACEOF Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-libopennet Enable opennet support |
︙ | ︙ | |||
951 952 953 954 955 956 957 | cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF | | | | 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 | cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF libconfig configure 0.1.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit 0 fi exec 5>config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libconfig $as_me 0.1.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ _ACEOF { cat <<_ASUNAME |
︙ | ︙ | |||
15439 15440 15441 15442 15443 15444 15445 | break fi done | > | | 15439 15440 15441 15442 15443 15444 15445 15446 15447 15448 15449 15450 15451 15452 15453 15454 | break fi done for ac_func in strsep strtoll getuid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else |
︙ | ︙ | |||
17205 17206 17207 17208 17209 17210 17211 | echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF | | | 17206 17207 17208 17209 17210 17211 17212 17213 17214 17215 17216 17217 17218 17219 17220 | echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF This file was extended by libconfig $as_me 0.1.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ |
︙ | ︙ | |||
17265 17266 17267 17268 17269 17270 17271 | $config_headers Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ | | | 17266 17267 17268 17269 17270 17271 17272 17273 17274 17275 17276 17277 17278 17279 17280 | $config_headers Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ libconfig config.status 0.1.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir |
︙ | ︙ |
Modified configure.ac from [e41d1c8825] to [49b46603c1].
1 | AC_REVISION($Revision $) | | | 1 2 3 4 5 6 7 8 9 | AC_REVISION($Revision $) AC_INIT(libconfig, 0.1.7) AC_CONFIG_HEADER(config.h) dnl Find out about the host OS DC_CHK_OS_INFO dnl Checks for programs. AC_PROG_CC |
︙ | ︙ | |||
20 21 22 23 24 25 26 | DC_DO_TYPE(uint64_t, unsigned, 8) DC_DO_TYPE(int64_t, signed, 8) DC_DO_TYPE(uint32_t, unsigned, 4) DC_DO_TYPE(int32_t, signed, 4) DC_DO_TYPE(uint16_t, unsigned, 2) DC_DO_TYPE(int16_t, signed, 2) | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | DC_DO_TYPE(uint64_t, unsigned, 8) DC_DO_TYPE(int64_t, signed, 8) DC_DO_TYPE(uint32_t, unsigned, 4) DC_DO_TYPE(int32_t, signed, 4) DC_DO_TYPE(uint16_t, unsigned, 2) DC_DO_TYPE(int16_t, signed, 2) AC_REPLACE_FUNCS(strsep strtoll getuid) AC_CHECK_FUNCS(getpwuid) DC_ASK_OPTLIB(opennet, fopen_net, opennet.h, [ Enable opennet support], libopennet, HAVE_LIBOPENNET, HAVE_OPENNET_H) dnl Checks for Win32 specific things. DC_DO_WIN32 dnl This must be last. DC_GET_SHOBJFLAGS AC_OUTPUT(Makefile lc_geterrno.3 lc_process.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 lc_cleanup.3 lc_process_file.3 libconfig.3) |
Added getuid.c version [721d47a38b].
> > > > > | 1 2 3 4 5 | #include "getuid.h" uid_t getuid(void) { return(0); } |
Added getuid.h version [bc30b2d770].
> > > > > > > > | 1 2 3 4 5 6 7 8 | #ifndef _LC_GETUID_H #define _LC_GETUID_H typedef int uid_t; uid_t getuid(void); #endif |
Modified lc_cleanup.3.in from [da39a3ee5e] to [1a58c9eea6].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | .TH LC_GETERRNO 3 "25 Oct 04" "@PACKAGE_STRING@" .SH NAME lc_cleanup \- Clean up internal structures after processing data. .SH SYNOPSIS .B #include <libconfig.h> .sp .BI "void lc_cleanup(void);" .SH DESCRIPTION The .BR lc_cleanup (3) function cleans up the internal structures created by calling .BR lc_register_var (3) or .BR lc_register_callback (3) and returns the memory to the application. It is not strictly required, however memory concious programmers will still want to call this after finishing processing configuration files. After you call .BR lc_cleanup (3) calling .BR lc_process (3) or .BR lc_process_file (3) will generally cause errors since the registered variables and callbacks have been unregistered. .SH EXAMPLE .nf #include <libconfig.h> #include <stdlib.h> #include <stdio.h> int main(int argc, char **argv) { int lc_p_ret, lc_rv_ret; char *filename = NULL; lc_rv_ret = lc_register_var("File", LC_VAR_STRING, &filename, 'f'); if (lc_rv_ret != 0) { fprintf(stderr, "Error registering variable: %i.\\n", lc_geterrno()); return(EXIT_FAILURE); } lc_p_ret = lc_process(argc, argv, "example", LC_CONF_APACHE, NULL); lc_cleanup(); if (lc_p_ret != 0) { fprintf(stderr, "Error processing configuration: \\ %s\\n", lc_geterrstr()); return(EXIT_FAILURE); } if (filename != NULL) { printf("File specified was: %s\\n", filename); } else { printf("No filename specified.\\n"); } return(EXIT_SUCCESS); } .fi .SH "SEE ALSO" .BR lc_register_var (3), .BR lc_register_callback (3), .BR lc_geterrstr (3), .BR lc_geterrno (3), .BR lc_process_file (3), .BR lc_process (3) |
Modified libconfig.c from [8802ab0d93] to [a7581f8b4f].
︙ | ︙ | |||
813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 | snprintf(configfiles[1][7], sizeof(**configfiles) - 1, "/usr/etc/%s/%s.conf", appname, appname); snprintf(configfiles[1][8], sizeof(**configfiles) - 1, "/usr/local/etc/%s.cfg", appname); snprintf(configfiles[1][9], sizeof(**configfiles) - 1, "/usr/local/etc/%s.conf", appname); snprintf(configfiles[1][10], sizeof(**configfiles) - 1, "/usr/local/etc/%s/%s.cfg", appname, appname); snprintf(configfiles[1][11], sizeof(**configfiles) - 1, "/usr/local/etc/%s/%s.conf", appname, appname); if (getuid() != 0) { homedir = getenv("HOME"); if (homedir == NULL) { pwinfo = getpwuid(getuid()); if (pwinfo != NULL) { homedir = pwinfo->pw_dir; } } if (homedir != NULL) { if (strcmp(homedir, "/") != 0 && access(homedir, R_OK|W_OK|X_OK) == 0) { snprintf(configfiles[2][0], sizeof(**configfiles) - 1, "%s/.%src", homedir, appname); snprintf(configfiles[2][1], sizeof(**configfiles) - 1, "%s/.%s.cfg", homedir, appname); snprintf(configfiles[2][2], sizeof(**configfiles) - 1, "%s/.%s.conf", homedir, appname); snprintf(configfiles[2][3], sizeof(**configfiles) - 1, "%s/.%s/%s.cfg", homedir, appname, appname); snprintf(configfiles[2][4], sizeof(**configfiles) - 1, "%s/.%s/%s.conf", homedir, appname, appname); | > > | 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 | snprintf(configfiles[1][7], sizeof(**configfiles) - 1, "/usr/etc/%s/%s.conf", appname, appname); snprintf(configfiles[1][8], sizeof(**configfiles) - 1, "/usr/local/etc/%s.cfg", appname); snprintf(configfiles[1][9], sizeof(**configfiles) - 1, "/usr/local/etc/%s.conf", appname); snprintf(configfiles[1][10], sizeof(**configfiles) - 1, "/usr/local/etc/%s/%s.cfg", appname, appname); snprintf(configfiles[1][11], sizeof(**configfiles) - 1, "/usr/local/etc/%s/%s.conf", appname, appname); if (getuid() != 0) { homedir = getenv("HOME"); #ifdef HAVE_GETPWUID if (homedir == NULL) { pwinfo = getpwuid(getuid()); if (pwinfo != NULL) { homedir = pwinfo->pw_dir; } } #endif if (homedir != NULL) { if (strcmp(homedir, "/") != 0 && access(homedir, R_OK|W_OK|X_OK) == 0) { snprintf(configfiles[2][0], sizeof(**configfiles) - 1, "%s/.%src", homedir, appname); snprintf(configfiles[2][1], sizeof(**configfiles) - 1, "%s/.%s.cfg", homedir, appname); snprintf(configfiles[2][2], sizeof(**configfiles) - 1, "%s/.%s.conf", homedir, appname); snprintf(configfiles[2][3], sizeof(**configfiles) - 1, "%s/.%s/%s.cfg", homedir, appname, appname); snprintf(configfiles[2][4], sizeof(**configfiles) - 1, "%s/.%s/%s.conf", homedir, appname, appname); |
︙ | ︙ |