git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stepan Kasal <kasal@ucw.cz>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Karsten Blees <karsten.blees@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Erik Faye-Lund <kusmabite@gmail.com>,
	Duy Nguyen <pclouds@gmail.com>,
	GIT Mailing-list <git@vger.kernel.org>,
	Thomas Braun <thomas.braun@virtuell-zuhause.de>,
	msysGit <msysgit@googlegroups.com>
Subject: [PATCH v3] Add a Windows-specific fallback to getenv("HOME");
Date: Thu, 5 Jun 2014 12:23:46 +0200	[thread overview]
Message-ID: <20140605102346.GA28309@camelia.ucw.cz> (raw)
In-Reply-To: <53902B2C.7050807@web.de>

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 2 Jun 2010 00:41:33 +0200

If HOME is not set, use $HOMEDRIVE$HOMEPATH

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
---

On Thu, Jun 05, 2014 at 10:32:44AM +0200, Torsten Bögershausen wrote:
> > +		strbuf_addf(&buf, "%s%s", getenv_cs("HOMEDRIVE"), getenv_cs("HOMEPATH"));
> should we have a NULL pointer check here?

You are right, of course.

> If HOMEDRIVE is set, but not HOMEPATH, we can fall back into the root of HOMEDRIVE:

Indeed, but it means setting homepath="\\";

Updated according to your comments.  Thanks,
	Stepan

 compat/mingw.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/compat/mingw.c b/compat/mingw.c
index a0e13bc..14af013 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1181,6 +1181,17 @@ char *mingw_getenv(const char *name)
 		if (!result)
 			result = getenv_cs("TEMP");
 	}
+	if (!result && !strcmp(name, "HOME")) {
+		const char *homedrive = getenv_cs("HOMEDRIVE");
+		const char *homepath = getenv_cs("HOMEPATH");
+		if (homedrive) {
+			struct strbuf buf = STRBUF_INIT;
+			if (!homepath)
+				homepath = "\\";
+			strbuf_addf(&buf, "%s%s", homedrive, homepath);
+			result = strbuf_detach(&buf, NULL);
+		}
+	}
 	return result;
 }
 
-- 
2.0.0.9635.g0be03cb

-- 
-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en

--- 
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

  reply	other threads:[~2014-06-05 10:23 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-04 11:47 [PATCH] Add a Windows-specific fallback to getenv("HOME"); Stepan Kasal
2014-06-04 13:47 ` Duy Nguyen
2014-06-04 14:05   ` Erik Faye-Lund
2014-06-04 14:55     ` Karsten Blees
2014-06-04 15:14     ` Johannes Schindelin
2014-06-04 15:18       ` Erik Faye-Lund
2014-06-04 15:27         ` Johannes Schindelin
2014-06-04 15:45           ` Stepan Kasal
2014-06-04 15:56             ` [msysGit] " Johannes Schindelin
2014-06-04 16:16               ` Stepan Kasal
2014-06-04 17:49                 ` [msysGit] " Johannes Schindelin
2014-06-06  9:12                   ` Git for Windows SDK Philip Oakley
2014-06-04 23:10                 ` Re: [PATCH] Add a Windows-specific fallback to getenv("HOME"); Duy Nguyen
2014-06-06 19:26                 ` Sebastian Schuberth
2014-06-04 15:46           ` Johannes Schindelin
2014-06-05  1:42             ` Karsten Blees
2014-06-05  8:03               ` [PATCH v2] " Stepan Kasal
2014-06-05  8:32                 ` [msysGit] " Torsten Bögershausen
2014-06-05 10:23                   ` Stepan Kasal [this message]
2014-06-05  9:40                 ` Karsten Blees
2014-06-05  9:58                   ` Erik Faye-Lund
2014-06-05 21:44                     ` Karsten Blees
2014-06-06  8:03                       ` Stepan Kasal
2014-06-05 11:23                   ` Stepan Kasal
2014-06-05 13:39                   ` Johannes Schindelin
2014-06-05 20:03                     ` Karsten Blees
2014-06-05 12:03               ` Re: [PATCH] " Johannes Schindelin
2014-06-05 12:15                 ` [msysGit] " Stepan Kasal
2014-06-05 14:33                 ` Karsten Blees
2014-06-04 14:53   ` Stepan Kasal
2014-06-04 15:13   ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140605102346.GA28309@camelia.ucw.cz \
    --to=kasal@ucw.cz \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=karsten.blees@gmail.com \
    --cc=kusmabite@gmail.com \
    --cc=msysgit@googlegroups.com \
    --cc=pclouds@gmail.com \
    --cc=tboegi@web.de \
    --cc=thomas.braun@virtuell-zuhause.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).