diff options
| author | Adam Tkac <atkac@redhat.com> | 2011-02-07 10:45:15 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2011-02-07 10:45:15 +0000 |
| commit | af0817220ee171837b4c15019fe16c2d5de180ad (patch) | |
| tree | c7915b28be52f72dbcc864dffa42340ff86266e5 /common/os | |
| parent | a6da9f388fd66b4f52bedde44dbc2655413e5a4e (diff) | |
| download | tigervnc-af0817220ee171837b4c15019fe16c2d5de180ad.tar.gz tigervnc-af0817220ee171837b4c15019fe16c2d5de180ad.zip | |
[Development] Rename function "gethomedir" to "getvnchomedir" and rewrite it in
platform-intependent manner.
Thanks to Guillaume Destuynder.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4252 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/os')
| -rw-r--r-- | common/os/os.cxx | 11 | ||||
| -rw-r--r-- | common/os/os.h | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/os/os.cxx b/common/os/os.cxx index fb07dcf6..c08b5728 100644 --- a/common/os/os.cxx +++ b/common/os/os.cxx @@ -36,7 +36,7 @@ #include <shlobj.h> #endif -int gethomedir(char **dirp) +int getvnchomedir(char **dirp) { #ifndef WIN32 char *homedir, *dir; @@ -62,12 +62,13 @@ int gethomedir(char **dirp) homedir = passwd->pw_dir; } - len = strlen(homedir) + 1; - dir = new char[len]; + len = strlen(homedir); + dir = new char[len+7]; if (dir == NULL) return -1; memcpy(dir, homedir, len); + memcpy(dir + len, "/.vnc/\0", 7); #else dir = new TCHAR[MAX_PATH]; if (dir == NULL) @@ -78,10 +79,8 @@ int gethomedir(char **dirp) delete [] dir; return -1; } - - + memcpy(dir+strlen(dir), (TCHAR *)"\\vnc\\\0", 6); #endif - *dirp = dir; return 0; } diff --git a/common/os/os.h b/common/os/os.h index 18e61e23..d011764e 100644 --- a/common/os/os.h +++ b/common/os/os.h @@ -24,7 +24,8 @@ #endif /* - * Get home directory. If HOME environment variable is set then it is returned. + * Get VNC home directory ($HOME/.vnc or %APPDATA%/vnc/). + * If HOME environment variable is set then it is used. * Otherwise home directory is obtained via getpwuid function. * * Note for Windows: @@ -34,6 +35,6 @@ * 0 - Success * -1 - Failure */ -int gethomedir(char **dirp); +int getvnchomedir(char **dirp); #endif /* OS_OS_H */ |