Merge OS/2 filename code.

This commit is contained in:
2021-03-12 00:07:06 +00:00
parent 8e10a1f898
commit d2ff4a2dda
2 changed files with 11 additions and 114 deletions

View File

@@ -1,102 +0,0 @@
/****************************************************************************
Aaru Data Preservation Suite
-----------------------------------------------------------------------------
Filename : os2_32.c
Author(s) : Natalia Portillo
--[ Description ] -----------------------------------------------------------
Contains 32-bit OS/2 code
--[ License ] ---------------------------------------------------------------
This program 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 3 of the
License, or (at your option) any later version.
This program 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 program. If not, see <http://www.gnu.org/licenses/>.
-----------------------------------------------------------------------------
Copyright (C) 2011-2021 Natalia Portillo
*****************************************************************************/
#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) && \
(defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
#define INCL_DOSMISC
#define INCL_DOSFILEMGR
#include <os2.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../os2.h"
#include "include/consts.h"
#include "include/defs.h"
void Filenames(const char* path)
{
char drivePath[4];
APIRET rc = 0, wRc = 0, cRc = 0;
ULONG actionTaken = 0;
HFILE handle;
char message[300];
int pos = 0;
drivePath[0] = path[0];
drivePath[1] = ':';
drivePath[2] = '\\';
drivePath[3] = 0;
rc = DosSetCurrentDir(drivePath);
if(rc)
{
printf("Cannot change to specified path, not continuing.\n");
return;
}
rc = DosCreateDir("FILENAME", NULL);
if(rc)
{
printf("Cannot create working directory.\n");
return;
}
rc = DosSetCurrentDir("FILENAME");
printf("Creating files with different filenames.\n");
for(pos = 0; filenames[pos]; pos++)
{
rc = DosOpen((PSZ)filenames[pos],
&handle,
&actionTaken,
0,
FILE_NORMAL,
OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_FAIL_IF_EXISTS,
OPEN_FLAGS_NOINHERIT | OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
0);
if(!rc)
{
memset(&message, 0, 300);
sprintf(&message, FILENAME_FORMAT, filenames[pos]);
wRc = DosWrite(handle, &message, strlen(message), &actionTaken);
cRc = DosClose(handle);
}
printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d\n", filenames[pos], rc, wRc, cRc);
}
}
#endif

View File

@@ -27,8 +27,7 @@ Contains 16-bit OS/2 code
Copyright (C) 2011-2021 Natalia Portillo
*****************************************************************************/
#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) && \
!defined(__DOS__)
#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
#define INCL_DOSMISC
#define INCL_DOSFILEMGR
@@ -38,25 +37,25 @@ Copyright (C) 2011-2021 Natalia Portillo
#include <stdlib.h>
#include <string.h>
#include "../os2.h"
#include "include/consts.h"
#include "include/defs.h"
#include "os2.h"
void Filenames(const char* path)
{
char drivePath[4];
USHORT rc = 0, wRc = 0, cRc = 0;
USHORT actionTaken = 0;
HFILE handle;
char message[300];
int pos = 0;
char drivePath[4];
APIRET rc = 0, wRc = 0, cRc = 0;
ACTION_RET actionTaken = 0;
HFILE handle;
char message[300];
int pos = 0;
drivePath[0] = path[0];
drivePath[1] = ':';
drivePath[2] = '\\';
drivePath[3] = 0;
rc = DosChDir(drivePath, 0);
rc = __os2_chdir(drivePath);
if(rc)
{
@@ -64,7 +63,7 @@ void Filenames(const char* path)
return;
}
rc = DosMkDir("FILENAME", 0);
rc = __os2_mkdir("FILENAME");
if(rc)
{
@@ -72,7 +71,7 @@ void Filenames(const char* path)
return;
}
rc = DosChDir("FILENAME", 0);
rc = __os2_chdir("FILENAME");
printf("Creating files with different filenames.\n");