Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to nsinstall

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@132608 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2002-10-28 23:25:11 +00:00
parent 6ca97a5e22
commit 18cbc52b16
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
buildtools/os2/source/nsinstall/nsinstall.c
View File

@ -19,6 +19,7 @@
#include <assert.h> #include <assert.h>
#define INCL_DOSFILEMGR #define INCL_DOSFILEMGR
#define INCL_DOSERRORS #define INCL_DOSERRORS
#define INCL_WINERRORS
#include <os2.h> #include <os2.h>
#pragma hdrstop #pragma hdrstop
@ -74,6 +75,7 @@ shellNsinstall (char **pArgv)
int dirOnly = 0; /* 1 if and only if -D is specified */ int dirOnly = 0; /* 1 if and only if -D is specified */
char **pSrc; char **pSrc;
char **pDst; char **pDst;
int len;
/* /*
* Process the command-line options. We ignore the * Process the command-line options. We ignore the
@ -116,6 +118,11 @@ shellNsinstall (char **pArgv)
while ( *pArgv ) while ( *pArgv )
pDst = pArgv++; pDst = pArgv++;
/* remove trailing slash from desination directory */
len = strlen( *pDst );
if ( pDst[0][len-1] == '/' )
pDst[0][len-1] = '\0';
retVal = shellMkdir ( pDst ); retVal = shellMkdir ( pDst );
if ( retVal ) if ( retVal )
return retVal; return retVal;
@ -183,18 +190,27 @@ static const char *
sh_GetLastErrorMessage() sh_GetLastErrorMessage()
{ {
static char buf[128]; static char buf[128];
ERRORID error = WinGetLastError(0);
switch (ERRORIDSEV(error))
{
case SEVERITY_ERROR:
{
sprintf( buf, "error %d", ERRORIDERROR(error));
break;
}
case SEVERITY_SEVERE:
{
sprintf( buf, "severe error %d", ERRORIDERROR(error));
break;
}
case SEVERITY_UNRECOVERABLE:
{
sprintf( buf, "unrecoverable error %d", ERRORIDERROR(error));
break;
}
}
#ifdef OLDCODE
FormatMessage(
FORMAT_MESSAGE_FROM_SYSTEM,
NULL,
GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* default language */
buf,
sizeof(buf),
NULL
);
#endif
return buf; return buf;
} }
@ -723,5 +739,6 @@ static ULONG GetFileAttributes(PSZ pszFileName)
static APIRET SetFileAttributes(PSZ pszFileName, ULONG ulFileAttributes) static APIRET SetFileAttributes(PSZ pszFileName, ULONG ulFileAttributes)
{ {
return NULL;
} }