Commit 8be602cd authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Based on Gisle Vanem's $HOME patch, we now attempt to find the home dir 

in a slightly better way for more platforms. The $HOME is only used for
.curlrc atm, but the possible upcoming change of .netrc treatment may also
need the home dir.
parent 3dd40cca

src/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endif 
curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c setup.h \

	config-win32.h config-mac.h config-vms.h config-riscos.h \

	urlglob.h version.h writeout.h writeenv.c writeenv.h \

	getpass.c getpass.h

	getpass.c getpass.h homedir.c homedir.h



curl_LDADD = ../lib/libcurl.la

curl_DEPENDENCIES = ../lib/libcurl.la

src/config.h.in

+6 −0
Original line number Diff line number Diff line
@@ -67,3 +67,9 @@ 


/* Define to 1 if you have the <termio.h> header file. */

#undef HAVE_TERMIO_H



/* Define to 1 if you have the `getpwuid' function. */

#undef HAVE_GETPWUID



/* Define to 1 if you have the `geteuid' function. */

#undef HAVE_GETEUID

src/homedir.c

0 → 100644
+114 −0
Original line number Diff line number Diff line 
/***************************************************************************

 *                                  _   _ ____  _     

 *  Project                     ___| | | |  _ \| |    

 *                             / __| | | | |_) | |    

 *                            | (__| |_| |  _ <| |___ 

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at http://curl.haxx.se/docs/copyright.html.

 * 

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 * $Id$

 ***************************************************************************/



#include "setup.h"



#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#ifdef WIN32

#include <windows.h>

#endif

#ifdef HAVE_PWD_H

#include <pwd.h>

#endif

#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

#ifdef VMS

#include <unixlib.h>

#endif



#ifdef CURLDEBUG

#include "../lib/memdebug.h"

#endif



static

char *GetEnv(const char *variable, bool do_expand)

{

  char *env = NULL;

#ifdef WIN32

  char  buf1[1024], buf2[1024];

  DWORD rc;



  /* Don't use getenv(); it doesn't find variable added after program was

   * started. Don't accept truncated results (i.e. rc >= sizeof(buf1)).  */

  

  rc = GetEnvironmentVariable(variable, buf1, sizeof(buf1));

  if (rc > 0 && rc < sizeof(buf1)) {

    env = buf1;

    variable = buf1;

  }

  if (do_expand && strchr(variable,'%')) {

    /* buf2 == variable if not expanded */

    rc = ExpandEnvironmentStrings (variable, buf2, sizeof(buf2));

    if (rc > 0 && rc < sizeof(buf2) &&

        !strchr(buf2,'%'))    /* no vars still unexpanded */

      env = buf2;

  }

#else

  (void)do_expand;

#ifdef	VMS

  env = getenv(variable);

  if (env && strcmp("HOME",variable) == 0) {

	env = decc$translate_vms(env);

  }

#else

  /* no length control */

  env = getenv(variable);

#endif

#endif

  return (env && env[0])?strdup(env):NULL;

}



/* return the home directory of the current user as an allocated string */

char *homedir(void)

{

  char *home = GetEnv("HOME", FALSE);

  if(home)

    return home;

  

#if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)

 {

   struct passwd *pw = getpwuid(geteuid());

  

   if (pw) {

#ifdef VMS

     home = decc$translate_vms(pw->pw_dir);

#else

     home = pw->pw_dir;

#endif

     if (home && home[0])

       home = strdup(home);

   }

 }

#endif /* PWD-stuff */

#ifdef WIN32

  home = GetEnv("APPDATA", TRUE);

  if(!home)

    home = GetEnv("%USERPROFILE%\\Application Data", TRUE); /* Normally only

                                                               on Win-2K/XP */

#endif /* WIN32 */

  return home;

}

src/homedir.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#ifndef __HOMEDIR_H

#define __HOMEDIR_H

/***************************************************************************

 *                                  _   _ ____  _     

 *  Project                     ___| | | |  _ \| |    

 *                             / __| | | | |_) | |    

 *                            | (__| |_| |  _ <| |___ 

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at http://curl.haxx.se/docs/copyright.html.

 * 

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 * $Id$

 ***************************************************************************/



char *homedir(void);



#endif

src/main.c

+3 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "urlglob.h"

#include "writeout.h"

#include "getpass.h"

#include "homedir.h"

#ifdef USE_ENVIRONMENT

#include "writeenv.h"

#endif
@@ -2055,10 +2056,9 @@ static int parseconfig(const char *filename, 
#define CURLRC DOT_CHAR "curlrc"



    filename = CURLRC;   /* sensible default */

    home = curl_getenv("HOME"); /* portable environment reader */

    home = homedir();    /* portable homedir finder */

    if(home) {

      if(strlen(home)<(sizeof(filebuffer)-strlen(CURLRC))) {



        snprintf(filebuffer, sizeof(filebuffer),

                 "%s%s%s", home, DIR_CHAR, CURLRC);