From 368cb1fe20b66b91389f834019e2c2c18bdae8b7 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 5 Mar 2012 11:12:58 +0000 Subject: avoid deleting valid symbolic links to .htoprc so that home directories can be used with both old and new versions of htop (see #3496731). --- Settings.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Settings.c b/Settings.c index f2573e82..4782e84b 100644 --- a/Settings.c +++ b/Settings.c @@ -239,7 +239,9 @@ Settings* Settings_new(ProcessList* pl, Header* header, int cpuCount) { mkdir(htopDir, 0700); free(htopDir); free(configDir); - if (access(legacyDotfile, R_OK) != 0) { + struct stat st; + lstat(legacyDotfile, &st); + if (access(legacyDotfile, R_OK) != 0 || S_ISLNK(st.st_mode)) { free(legacyDotfile); legacyDotfile = NULL; } -- cgit v1.2.3