From 2aa8cf97f760697206e4fa46354572e3f73e4191 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 6 Sep 2004 14:59:12 +0200 Subject: [PATCH] cope with HOME not being set --- ccache.c | 2 +- ccache.h | 4 ++ configure | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.in | 5 ++- util.c | 22 +++++++++++ 5 files changed, 134 insertions(+), 5 deletions(-) diff --git a/ccache.c b/ccache.c index 4ec70138a..08bc36b9f 100644 --- a/ccache.c +++ b/ccache.c @@ -969,7 +969,7 @@ int main(int argc, char *argv[]) cache_dir = getenv("CCACHE_DIR"); if (!cache_dir) { - x_asprintf(&cache_dir, "%s/.ccache", getenv("HOME")); + x_asprintf(&cache_dir, "%s/.ccache", get_home_directory()); } cache_logfile = getenv("CCACHE_LOGFILE"); diff --git a/ccache.h b/ccache.h index c8fa01fc7..55220daa9 100644 --- a/ccache.h +++ b/ccache.h @@ -19,6 +19,9 @@ #include #include #include +#ifdef HAVE_PWD_H +#include +#endif #define STATUS_NOTFOUND 3 #define STATUS_FATAL 4 @@ -91,6 +94,7 @@ int safe_open(const char *fname); char *x_realpath(const char *path); char *gnu_getcwd(void); int create_empty_file(const char *fname); +const char *get_home_directory(void); void stats_update(enum stats stat); void stats_zero(void); diff --git a/configure b/configure index d18c9241c..227567798 100755 --- a/configure +++ b/configure @@ -3285,7 +3285,8 @@ done -for ac_header in ctype.h strings.h stdlib.h string.h + +for ac_header in ctype.h strings.h stdlib.h string.h pwd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -3440,8 +3441,109 @@ done +for ac_func in realpath snprintf vsnprintf vasprintf asprintf mkstemp +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 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + -for ac_func in realpath snprintf vsnprintf vasprintf asprintf mkstemp gethostname +for ac_func in gethostname getpwuid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/configure.in b/configure.in index 5f591090e..3229ef0b7 100644 --- a/configure.in +++ b/configure.in @@ -27,9 +27,10 @@ AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h) +AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h) -AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp gethostname) +AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp) +AC_CHECK_FUNCS(gethostname getpwuid) AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ AC_TRY_COMPILE( diff --git a/util.c b/util.c index 10beadf11..ec5ccdd49 100644 --- a/util.c +++ b/util.c @@ -430,3 +430,25 @@ int create_empty_file(const char *fname) close(fd); return 0; } + +/* + return current users home directory or die +*/ +const char *get_home_directory(void) +{ + const char *p = getenv("HOME"); + if (p) { + return p; + } +#ifdef HAVE_GETPWUID + { + struct passwd *pwd = getpwuid(getuid()); + if (pwd) { + return pwd->pw_dir; + } + } +#endif + fatal("Unable to determine home directory"); + return NULL; +} + -- 2.47.3