Revision: 4176
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4176&view=rev
Author: atkac
Date: 2010-10-29 12:07:14 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
[Development] Introduce gethomedir() function to retrieve home directory path.
Modified Paths:
--------------
trunk/common/os/CMakeLists.txt
trunk/common/os/Makefile.am
Added Paths:
-----------
trunk/common/os/os.cxx
trunk/common/os/os.h
Modified: trunk/common/os/CMakeLists.txt
===================================================================
--- trunk/common/os/CMakeLists.txt 2010-10-27 08:09:44 UTC (rev 4175)
+++ trunk/common/os/CMakeLists.txt 2010-10-29 12:07:14 UTC (rev 4176)
@@ -2,4 +2,5 @@
add_library(os STATIC
print.c
- net.c)
+ net.c
+ os.cxx)
Modified: trunk/common/os/Makefile.am
===================================================================
--- trunk/common/os/Makefile.am 2010-10-27 08:09:44 UTC (rev 4175)
+++ trunk/common/os/Makefile.am 2010-10-29 12:07:14 UTC (rev 4176)
@@ -1,8 +1,8 @@
noinst_LTLIBRARIES = libos.la
-HDRS = net.h print.h
+HDRS = net.h print.h os.h
-libos_la_SOURCES = $(HDRS) print.c net.c
+libos_la_SOURCES = $(HDRS) print.c net.c os.cxx
libos_la_CPPFLAGS = -I$(top_srcdir)/common
Added: trunk/common/os/os.cxx
===================================================================
--- trunk/common/os/os.cxx (rev 0)
+++ trunk/common/os/os.cxx 2010-10-29 12:07:14 UTC (rev 4176)
@@ -0,0 +1,64 @@
+/* Copyright (C) 2010 TightVNC Team. All Rights Reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <os/os.h>
+
+#include <assert.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+int gethomedir(char **dirp)
+{
+ char *homedir, *dir;
+ size_t len;
+ uid_t uid;
+ struct passwd *passwd;
+
+ assert(dirp != NULL && *dirp == NULL);
+
+#ifdef WIN32
+ /* Not supported, yet */
+ return -1;
+#endif
+
+ homedir = getenv("HOME");
+ if (homedir == NULL) {
+ uid = getuid();
+ passwd = getpwuid(uid);
+ if (passwd == NULL) {
+ /* Do we want emit error msg here? */
+ return -1;
+ }
+ homedir = passwd->pw_dir;
+ }
+
+ len = strlen(homedir) + 1;
+ dir = new char[len];
+ memcpy(dir, homedir, len);
+
+ *dirp = dir;
+ return 0;
+}
+
Added: trunk/common/os/os.h
===================================================================
--- trunk/common/os/os.h (rev 0)
+++ trunk/common/os/os.h 2010-10-29 12:07:14 UTC (rev 4176)
@@ -0,0 +1,36 @@
+/* Copyright (C) 2010 TightVNC Team. All Rights Reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ */
+
+#ifndef OS_OS_H
+#define OS_OS_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/*
+ * Get home directory. If HOME environment variable is set then it is returned.
+ * Otherwise home directory is obtained via getpwuid function.
+ *
+ * Returns:
+ * 0 - Success
+ * -1 - Failure
+ */
+int gethomedir(char **dirp);
+
+#endif /* OS_OS_H */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
