github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-01-16 08:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Add parameter to dismount, better drive letter assignment, small bugs

Browse Source 
Dismount command lost drive parameter in previous commit.

Under windows, limit confusion by assigning pseudo-drive letters for images more
carefully.  Avoid letters used by Windows.

Dir /detail wasn't reporting rab$b_fsz correctly.

qualifier list keyword syntax error now reported correctly.

Include Windows release .exes in git.

Improve conditional compilation in compat.
This commit is contained in:
Timothe Litt 2016-02-29 22:24:30 -05:00
parent a88888f24e
commit 45e3b4e500
8 changed files with 174 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
extracters/ods2/ODS2-Image.exe Normal file
View File

Binary file not shown.

34
extracters/ods2/ODS2-Image/ODS2-Image.vcxproj
View File

@ -36,7 +36,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildAfterTargets>
</CustomBuildAfterTargets>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<CustomBuildAfterTargets>
</CustomBuildAfterTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -49,6 +56,21 @@
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalDependencies>access;cache;compat;device;direct;rms;sysmsg;update;vmstime;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<CustomBuildStep>
<Command>
</Command>
<Inputs>
</Inputs>
<Outputs>
</Outputs>
</CustomBuildStep>
<PreBuildEvent>
<Command>del $(SolutionDir)$(TargetName)$(TargetExt) &gt;nil.bak 2&gt;&amp;1 || exit /b 0</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -65,6 +87,16 @@
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalDependencies>access;cache;compat;device;direct;rms;sysmsg;update;vmstime;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<CustomBuildStep>
<Command>copy $(OutDir)$(TargetName)$(TargetExt) $(SolutionDir)$(TargetName)$(TargetExt) </Command>
<Outputs>$(SolutionDir)$(TargetName)$(TargetExt)</Outputs>
<Inputs>$(OutDir)$(TargetName)($(TargetExt)</Inputs>
<Message>Copying released $(TargetName)$(TargetExt)</Message>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\access.h" />

BIN
extracters/ods2/ODS2.exe Normal file
View File

Binary file not shown.

29
extracters/ods2/ODS2.vcxproj
View File

@ -34,9 +34,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<CustomBuildAfterTargets>
</CustomBuildAfterTargets>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets>Link</CustomBuildAfterTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -54,6 +57,23 @@
<DelayLoadDLLs>
</DelayLoadDLLs>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<CustomBuildStep>
<Command>
</Command>
<Outputs>
</Outputs>
<Inputs>
</Inputs>
<Message>
</Message>
</CustomBuildStep>
<PreBuildEvent>
<Command>del $(SolutionDir)$(TargetName)$(TargetExt) &gt;nil.bak 2&gt;&amp;1 || exit /b 0</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -69,6 +89,15 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<CustomBuildStep>
<Command>copy $(OutDir)$(TargetName)$(TargetExt) $(TargetName)$(TargetExt) </Command>
<Outputs>$(TargetName)$(TargetExt)</Outputs>
<Message>Copying $(TargetName)$(TargetExt)</Message>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="access.c" />

46
extracters/ods2/compat.c
View File

@ -7,13 +7,21 @@
* replacement until very recent IDEs.
* Microsoft doesn't like fopen.
* One needs to use a M$ call to translate system errors.
*
* Finding out about drive letter assignments is unique to windows.
*/
#if defined(_MSC_VER) && _MSC_VER < 1900
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include "compat.h"
#ifdef _WIN32
#include <windows.h>
#endif
#if defined(_MSC_VER) && _MSC_VER < 1900
int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
{
int count = -1;
@ -37,10 +45,9 @@ int c99_snprintf(char *outBuf, size_t size, const char *format, ...)
return count;
}
#endif
#ifdef _WIN32
#include <errno.h>
#include <windows.h>
#ifdef _MSC_VER
FILE *openf( const char *filename, const char *mode ) {
errno_t err;
@ -52,7 +59,9 @@ FILE *openf( const char *filename, const char *mode ) {
}
return NULL;
}
#endif
#ifdef _WIN32
TCHAR *w32_errstr( DWORD eno, ... ) {
va_list ap;
@ -71,7 +80,32 @@ TCHAR *w32_errstr( DWORD eno, ... ) {
va_end(ap);
return msg;
}
#endif
char *driveFromLetter( const char *letter ) {
DWORD rv = ERROR_INSUFFICIENT_BUFFER;
size_t cs = 16;
TCHAR *bufp = NULL;
do {
if( rv == ERROR_INSUFFICIENT_BUFFER ) {
TCHAR *newp;
cs *= 2;
newp = (TCHAR *) realloc( bufp, cs );
if( newp == NULL )
break;
bufp = newp;
}
rv = QueryDosDevice( letter, bufp, cs );
if( rv == 0 ) {
rv = GetLastError();
continue;
}
return bufp;
} while( rv == ERROR_INSUFFICIENT_BUFFER );
free( bufp );
return NULL;
}
#endif
/* For ISO C compliance, ensure that there's something in this module */

16
extracters/ods2/compat.h
View File

@ -13,18 +13,20 @@ int c99_snprintf(char *outBuf, size_t size, const char *format, ...);
#endif
#ifdef _WIN32
#include <stdio.h>
#include <windows.h>
#ifdef _MSC_VER
FILE *openf( const char *filename, const char *mode );
TCHAR *w32_errstr( DWORD eno, ... );
#else
#define openf fopen
#endif
#ifdef _WIN32
#include <stdarg.h>
#include <windows.h>
TCHAR *w32_errstr( DWORD eno, ... );
char *driveFromLetter( const char *letter );
#endif
#define UNUSED(x) (void)(x)
#endif

41
extracters/ods2/diskio.c
View File

@ -63,20 +63,57 @@ static char drives[26][4];
* the physical device. To keep it happy, map the next free drive letter to this
* filename, and use it to identify the device. phyio_init will check the mapping table
* to get the actual filename to open.
*
* To minimize confusion, under Windows, try to pick a pseudo-drive letter that
* isn't in use by windows. Avoid A & B unless all >= C are in use. If we can't
* find a non-conflicting letter, use the first letter not in use. Under any other
* OS, just use the first free letter.
*/
char *diskio_mapfile( const char *filename, int options ) {
int l, L = -1;
#ifdef _WIN32
int ff = -1, ffa = -1;
#endif
for( l = 0; l < 26; l++ ) {
if( diskfiles[l] == NULL && L < 0 ) L = l;
if( diskfiles[l] == NULL && L < 0) {
#ifdef _WIN32
char dl[3] = { 'A', ':', '\0' };
dl[0] += l;
if( ff < 0 )
ff = l;
if( driveFromLetter( dl ) == NULL) {
if( dl[0] >= 'C' ) {
if( L < 0 )
L = l;
} else {
if( ffa < 0 )
ffa = l;
}
}
#else
L = l;
#endif
}
if( diskfiles[l] && strcmp( diskfiles[l], filename ) == 0 ) {
printf( "%s is already mounted as drive %s\n", filename, drives[l] );
return NULL;
}
}
#ifdef _WIN32
if( L < 0 ) {
if( ffa >= 0 )
L = ffa;
else {
if( ff >= 0 )
L = ff;
}
}
#endif
if( L < 0 ) {
printf( "No free drive letters for %s\n", filename );
return 0;
return NULL;
}
snprintf(drives[L], 3, "%c:", L + 'A');
drives[L][3] = options;

67
extracters/ods2/ods2.c
View File

@ -1,6 +1,8 @@
#define MODULE_NAME ODS2
/* Feb-2016, v1.4 add readline support, dir/full etc */
/* Feb-2016, v1.4 add readline support, dir/full etc
* See git commit messages for details.
*/
/* Jul-2003, v1.3hb, some extensions by Hartmut Becker */
@ -51,7 +53,8 @@
* Feb 2016 Timothe Litt <litt at acm _ddot_ org>
* Bug fixes, readline support, build on NT without wnaspi32,
* Decode error messages, patch from vms2linux.de. VS project files.
* Rework command parsing and help. Bugs, bugs & bugs.
* Rework command parsing and help. Bugs, bugs & bugs. See git
* commit history for details.
*
* 31-AUG-2001 01:04 Hunter Goatley <goathunter@goatley.com>
*
@ -174,7 +177,7 @@ struct qual {
struct param;
struct CMDSET;
typedef const char * (hlpfunc_t)(struct CMDSET *cmd, struct param *p, int argc, char **argv);
typedef const char *(hlpfunc_t)( struct CMDSET *cmd, struct param *p, int argc, char **argv );
struct param {
const char *name;
@ -207,7 +210,8 @@ static int vms_qual = 1;
static int verify_cmd = 1;
/* checkquals: Given valid qualifier definitions, process qualifer
* list from a command left to right
* list from a command left to right. Also handles parameters and
* qualifier values (/Qual=value).
*/
int checkquals(int result, struct qual qualset[],int qualc,char *qualv[])
@ -254,7 +258,7 @@ int checkquals(int result, struct qual qualset[],int qualc,char *qualv[])
qv++;
nvp = strchr( qv, ')' );
if( nvp == NULL ) {
printf( "%%ODS2-W-NQP, %c%s is missing ')'\n",
printf( "%%ODS2-W-NQP, %c%s %s is missing ')'\n",
toupper( *type ), type+1, qualv[i] );
return -1;
}
@ -340,7 +344,7 @@ void pwrap( int *pos, const char *fmt, ... ) {
/* dir: a directory routine */
#define dir_extra (dir_date|dir_fileid|dir_owner|dir_prot|dir_size)
#define dir_extra (dir_date | dir_fileid | dir_owner | dir_prot | dir_size)
#define dir_date (1 << 0)
#define dir_fileid (1 << 1)
#define dir_owner (1 << 2)
@ -358,12 +362,12 @@ void pwrap( int *pos, const char *fmt, ... ) {
#define dir_created (1 << 12)
#define dir_expired (1 << 13)
#define dir_modified (1 << 14)
#define dir_dates (dir_backup | dir_created | dir_expired | dir_modified)
#define dir_allocated (1 << 15)
#define dir_used (1 << 16)
#define dir_sizes (dir_allocated | dir_used)
#define dir_dates (dir_backup|dir_created|dir_expired|dir_modified)
#define dir_default (dir_heading|dir_names|dir_trailing)
struct qual datekwds[] = { {"created", dir_created, 0, NV, "Date file created (default)"},
@ -405,7 +409,7 @@ struct qual dirquals[] = { {"brief", dir_default, ~dir_default, NV,
int dir_defopt = dir_default;
struct param dirpars[] = { {"filespec", OPT, VMSFS, NOPA, "for files to select. Wildcards are allowed."},
{ NULL, 0, 0, NOPA, NULL }
{ NULL, 0, 0, NOPA, NULL }
};
void dirtotal( int options, int size, int alloc ) {
@ -496,7 +500,7 @@ unsigned dir(int argc,char *argv[],int qualc,char *qualv[])
char dir[NAM$C_MAXRSS + 1];
int namelen;
int dirlen = 0;
int dirfiles = 0,dircount = 0;
int dirfiles = 0, dircount = 0;
int dirblocks = 0, diralloc = 0, totblocks = 0, totalloc = 0;
int printcol = 0;
#ifdef DEBUG
@ -509,7 +513,7 @@ unsigned dir(int argc,char *argv[],int qualc,char *qualv[])
while ((sts = sys_search(&fab)) & 1) {
if (dirlen != nam.nam$b_dev + nam.nam$b_dir ||
memcmp(rsa,dir,nam.nam$b_dev + nam.nam$b_dir) != 0) {
memcmp(rsa, dir, nam.nam$b_dev + nam.nam$b_dir) != 0) {
if (dirfiles > 0 && (options & dir_trailing)) {
if (printcol > 0) printf("\n");
printf("\nTotal of %d file%s",dirfiles,(dirfiles == 1 ? "" : "s"));
@ -643,8 +647,8 @@ unsigned dir(int argc,char *argv[],int qualc,char *qualv[])
pwrap( &pos, "Fixed length %u byte records", fab.fab$w_mrs ); break;
case FAB$C_VAR:
pwrap( &pos, "Variable length, maximum %u bytes", fab.fab$w_mrs ); break;
case FAB$C_VFC :
pwrap( &pos, "Variable length, fixed carriage control %u, maximum %u bytes", fab.fab$w_mrs ); break;
case FAB$C_VFC:
pwrap( &pos, "Variable length, fixed carriage control %u, maximum %u bytes", (fab.fab$b_fsz? fab.fab$b_fsz: 2), fab.fab$w_mrs ); break;
case FAB$C_STM:
pwrap( &pos, "Stream" ); break;
case FAB$C_STMLF:
@ -1251,34 +1255,6 @@ unsigned extend(int argc,char *argv[],int qualc,char *qualv[])
}
#if defined( _WIN32 ) && !defined( DISKIMAGE )
char *driveFromLetter( const char *letter ) {
DWORD rv = ERROR_INSUFFICIENT_BUFFER;
size_t cs = 16;
TCHAR *bufp = NULL;
do {
if( rv == ERROR_INSUFFICIENT_BUFFER ) {
TCHAR *newp;
cs *= 2;
newp = (TCHAR *) realloc( bufp, cs );
if( newp == NULL )
break;
bufp = newp;
}
rv = QueryDosDevice( letter, bufp, cs );
if( rv == 0 ) {
rv = GetLastError();
continue;
}
return bufp;
} while( rv == ERROR_INSUFFICIENT_BUFFER );
free( bufp );
return NULL;
}
#endif
/* show: version */
#define MNAMEX(n) #n
@ -1497,7 +1473,7 @@ const char * sethelp( struct CMDSET *cmd, struct param *p, int argc, char **argv
default:
abort();
}
return NULL;
return NULL;
}
unsigned set(int argc,char *argv[],int qualc,char *qualv[])
@ -1555,15 +1531,20 @@ unsigned set(int argc,char *argv[],int qualc,char *qualv[])
/* The bits we need when we don't have real VMS routines underneath... */
struct param dmopars[] = { {"drive_letter", REQ, STRING, NOPA, "Drive containing volume to dismount", },
{NULL, 0, 0, NOPA, NULL }
};
unsigned dodismount(int argc,char *argv[],int qualc,char *qualv[])
{
struct DEV *dev;
int sts = device_lookup(strlen(argv[1]),argv[1],0,&dev);
int sts;
UNUSED(argc);
UNUSED(qualc);
UNUSED(qualv);
sts = device_lookup(strlen(argv[1]),argv[1],0,&dev);
if (sts & 1) {
if (dev->vcb != NULL) {
sts = dismount(dev->vcb);
@ -1893,7 +1874,7 @@ struct CMDSET cmdset[] = {
{ "search", search, 0,NULL, searchpars, "Search VMS file for a string", },
{ "set", set, 0,NULL, setpars, "Set PARAMETER - set HELP for list", },
#ifndef VMSIO
{ "dismount", dodismount,0,NULL, NULL, "Dismount a VMS volume", },
{ "dismount", dodismount,0,NULL, dmopars, "Dismount a VMS volume", },
{ "mount", domount, 0,mouquals, moupars, "Mount a VMS volume", },
{ "statistics",statis, 0,NULL, NULL, "Display debugging statistics", },
#endif