walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Username is now accurately reported, which means that the default user dir works more correctly.

This commit is contained in:
Ryan C. Gordon 2002-04-02 14:33:08 +00:00
parent af1452aa64
commit 6519a249ff
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
platform/macclassic.c
View File

@ -13,8 +13,6 @@
* Please note that I haven't tried this code with CarbonLib or under * Please note that I haven't tried this code with CarbonLib or under
* MacOS X at all. The code in unix.c is known to work with Darwin, * MacOS X at all. The code in unix.c is known to work with Darwin,
* and you may or may not be better off using that. * and you may or may not be better off using that.
*
* GetDefaultUser() from PPCToolbox.h isn't supported in CarbonLib, for one.
*/ */
#ifdef __PHYSFS_CARBONIZED__ #ifdef __PHYSFS_CARBONIZED__
#include <Carbon.h> #include <Carbon.h>
@ -22,7 +20,9 @@
#include <OSUtils.h> #include <OSUtils.h>
#include <Processes.h> #include <Processes.h>
#include <Files.h> #include <Files.h>
#include <PPCToolbox.h> #include <TextUtils.h>
#include <Resources.h>
#include <MacMemory.h>
#endif #endif
#define __PHYSICSFS_INTERNAL__ #define __PHYSICSFS_INTERNAL__
@ -118,14 +118,27 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
char *__PHYSFS_platformGetUserName(void) char *__PHYSFS_platformGetUserName(void)
{ {
char *retval = NULL; char *retval = NULL;
Str32 name; StringHandle strHandle;
UInt32 ref; short origResourceFile = CurResFile();
BAIL_IF_MACRO(GetDefaultUser(&ref, name) != noErr, ERR_OS_ERROR, NULL);
/* use the System resource file. */
UseResFile(0);
/* apparently, -16096 specifies the username. */
strHandle = GetString(-16096);
UseResFile(origResourceFile);
BAIL_IF_MACRO(strHandle == NULL, ERR_OS_ERROR, NULL);
HLock((Handle) strHandle);
retval = (char *) malloc((*strHandle)[0] + 1);
if (retval == NULL)
{
HUnlock((Handle) strHandle);
BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL);
} /* if */
memcpy(retval, &(*strHandle)[1], (*strHandle)[0]);
retval[(*strHandle)[0]] = '\0'; /* null-terminate it. */
HUnlock((Handle) strHandle);
retval = (char *) malloc(name[0] + 1);
BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL);
memcpy(retval, &name[1], name[0]);
retval[name[0]] = '\0'; /* null-terminate it. */
return(retval); return(retval);
} /* __PHYSFS_platformGetUserName */ } /* __PHYSFS_platformGetUserName */