[Qemacs-commit] qemacs util.c qe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        13/11/28 15:52:39

Modified files:
        .              : util.c qe.c 

Log message:
        patch for OS/X to expand user home dir to /Users/xxx instead of 
/home/xxx
        this is a poor solution, should use a more generic method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/util.c?cvsroot=qemacs&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.98&r2=1.99

Patches:
Index: util.c
===================================================================
RCS file: /sources/qemacs/qemacs/util.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- util.c      4 May 2008 15:54:39 -0000       1.53
+++ util.c      28 Nov 2013 15:52:38 -0000      1.54
@@ -258,7 +258,11 @@
                 }
             } else {
                 /* CG: should get info from getpwnam */
+#ifdef CONFIG_DARWIN
+                pstrcpy(path, sizeof(path), "/Users/");
+#else
                 pstrcpy(path, sizeof(path), "/home/");
+#endif
                 pstrcat(path, sizeof(path), path1 + 1);
                 path1 = path;
             }

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- qe.c        23 Nov 2013 19:11:14 -0000      1.98
+++ qe.c        28 Nov 2013 15:52:39 -0000      1.99
@@ -7512,7 +7512,11 @@
     if (user) {
         /* use ~USER/.qe instead of ~/.qe */
         /* CG: should get user homedir */
+#ifdef CONFIG_DARWIN
+        snprintf(path, sizeof(path), "/Users/%s", user);
+#else
         snprintf(path, sizeof(path), "/home/%s", user);
+#endif
         home_path = path;
     } else {
         home_path = getenv("HOME");