ncpapi: rename c32ncp files to NCP API names

Finish the c32ncp.c/c32ncp.h to ncpapi.c/ncpapi.h rename.

Update the build files, include directives, dependency tracking, header guard,
README references and file-level comments to use the new ncpapi naming. This
matches the current split where ncpapi contains the ncpXX_YY_* protocol API
wrappers and ncpcall contains the lower-level requester/transport helpers.

No behavior change.
This commit is contained in:
Mario Fetka
2026-05-29 11:48:03 +02:00
parent d7f2a6551f
commit 3740e1450c
19 changed files with 39 additions and 39 deletions

View File

@@ -71,7 +71,7 @@ if(MARS_NWE_BUILD_DOSUTILS)
revoke.c
remove.c
trustee.c
c32ncp.c
ncpapi.c
nwcrypt.c
nwdebug.c
nwtests.c
@@ -122,7 +122,7 @@ if(MARS_NWE_BUILD_DOSUTILS)
"${CMAKE_CURRENT_SOURCE_DIR}/${src}"
"${CMAKE_CURRENT_SOURCE_DIR}/net.h"
"${CMAKE_CURRENT_SOURCE_DIR}/kern.h"
"${CMAKE_CURRENT_SOURCE_DIR}/c32ncp.h"
"${CMAKE_CURRENT_SOURCE_DIR}/ncpapi.h"
"${CMAKE_CURRENT_SOURCE_DIR}/nwcrypt.h"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
VERBATIM

View File

@@ -118,8 +118,8 @@ CAPTURE.EXE LPT1 Q1
The modern Client32 path is implemented through a small reusable helper layer:
- `c32ncp.c`
- `c32ncp.h`
- `ncpapi.c`
- `ncpapi.h`
- Client32 assembly entry points in `kern_wasm.asm`
The working sequence is:
@@ -678,7 +678,7 @@ They also install selected copies such as `login.exe`, `map.exe`, and `slist.exe
- `kern_wasm.asm` is the 16-bit Open Watcom assembly implementation used by the modern build.
- `kern.c` was an experimental C-side test wrapper and is no longer required by the current Client32 FLAG/FLAGDIR path.
- `c32ncp.c` and `c32ncp.h` contain reusable Client32 NCP helper functions for DOS tools.
- `ncpapi.c` and `ncpapi.h` contain reusable Client32 NCP helper functions for DOS tools.
- `trustee.c` and `trustee.h` contain shared code for `GRANT`, `REVOKE`, and `REMOVE`.
- `tools.c` contains shared command/frontend helpers so future smaller multicall binaries can reuse common parsing and path code.
- The verified Client32 path uses NCP 87 subfunction 6 for obtaining DOS information, subfunction 7 for modifying DOS information, subfunction 29 for effective rights, and trustee scan/add/delete calls for the trustee tools.

View File

@@ -19,7 +19,7 @@
/*
* Purpose: CREATOR utility for showing and changing NetWare file creator/owner metadata.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
/* creator.c - friendly creator/modifier/archiver metadata test tool
*
@@ -29,7 +29,7 @@
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#define DM_CREATE_DATE 0x00000004UL
#define DM_CREATE_TIME 0x00000008UL

4
flag.c
View File

@@ -19,12 +19,12 @@
/*
* Purpose: FLAG utility for displaying and changing NetWare DOS file attributes.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
/* flag.c - Novell FLAG-like DOS utility, stage 1 */
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include <dos.h>
/*

View File

@@ -19,12 +19,12 @@
/*
* Purpose: FLAGDIR utility for displaying and changing NetWare directory attributes.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
/* flagdir.c - Novell FLAGDIR-like DOS utility, Client32 version */
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include <dos.h>
#include <direct.h>

View File

@@ -19,12 +19,12 @@
/*
* Purpose: GRANT utility for assigning trustee rights on NetWare directories and files.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
/* grant.c - Novell GRANT-like DOS utility, first Client32 implementation */
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#define GRANT_BINDERY_USER 0x0001
#define GRANT_BINDERY_GROUP 0x0002

View File

@@ -18,7 +18,7 @@
; along with this program; if not, see <http://www.gnu.org/licenses/>.
; Purpose: Open Watcom WASM/MASM-syntax port of the low-level DOS, IPX, NetWare requester and Client32 glue.
; Depends on: kern.h declarations, netcall.c and c32ncp.c callers, net.h shared types.
; Depends on: kern.h declarations, netcall.c and ncpapi.c callers, net.h shared types.
;

View File

@@ -19,7 +19,7 @@
/*
* Purpose: NCOPY utility implementation and experimental server-side-copy/NCP74 investigation code.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
@@ -31,7 +31,7 @@
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include <dos.h>
#include <sys/types.h>
#include <sys/stat.h>

View File

@@ -20,11 +20,11 @@
/*
* Purpose: Semantically named NCP API helper implementation used by the NetWare DOS tools.
* Depends on: net.h, c32ncp.h, ncpcall.c requester/transport helpers, and netcall.c for shared requester state. This file is planned to become ncpapi.c.
* Depends on: net.h, ncpapi.h, ncpcall.c requester/transport helpers, and netcall.c for shared requester state. This file contains the protocol API layer above the low-level requester transport helpers.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
/*
* Legacy bindery/login NCP API wrappers.

View File

@@ -19,14 +19,14 @@
/*
* Purpose: Public declarations for namespace and file-system NCP API helpers.
* Depends on: net.h data types and c32ncp.c implementation; this file is planned to become ncpapi.h.
* Depends on: net.h data types and ncpapi.c implementation; this file is planned to become ncpapi.h.
*/
/* c32ncp.h - namespace/file-system NCP API helpers for mars-dosutils */
/* ncpapi.h - NetWare/NCP protocol API helpers for mars-dosutils */
#ifndef C32NCP_H
#define C32NCP_H
#ifndef NCPAPI_H
#define NCPAPI_H
UI ncp_build_handle_path(uint8 *buf, uint8 dhandle,
uint16 dirbase, uint8 style,

View File

@@ -20,15 +20,15 @@
/*
* Purpose: Low-level NCP requester and Client32 transport helpers for the NetWare DOS tools.
* Depends on: net.h, c32ncp.h, netcall.c requester glue, and kern_wasm.asm/kern.asm Net_Call/Client32 request entry points.
* Depends on: net.h, ncpapi.h, netcall.c requester glue, and kern_wasm.asm/kern.asm Net_Call/Client32 request entry points.
*
* The public ncpXX_YY_* protocol wrappers live in c32ncp.c, which is planned
* The public ncpXX_YY_* protocol wrappers live in ncpapi.c, which is planned
* to become ncpapi.c. This file keeps the lower-level requester/transport
* helpers that those API wrappers use.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
/* Client32 raw requester transport helpers used by the NCP API wrappers. */

4
ndir.c
View File

@@ -19,14 +19,14 @@
/*
* Purpose: NDIR utility for Novell-style directory listings and metadata display.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
/* ndir.c - first Novell NDIR-like directory listing utility */
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include <dos.h>
#include <sys/types.h>
#include <sys/stat.h>

2
net.h
View File

@@ -20,7 +20,7 @@
/*
* Purpose: Shared public header for the DOS utility collection: types, prototypes and common structures.
* Depends on: kern.h, all command modules, netcall.c, ncpcall.c, tools.c and c32ncp.c.
* Depends on: kern.h, all command modules, netcall.c, ncpcall.c, tools.c and ncpapi.c.
*/
#include <stddef.h>

View File

@@ -20,11 +20,11 @@
/*
* Purpose: NWTESTS diagnostic utility for exercising NetWare requester, NCP and namespace behavior.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#define TEST_RIGHT_S 0x01
#define TEST_RIGHT_R 0x02

View File

@@ -19,11 +19,11 @@
/*
* Purpose: REMOVE utility for removing trustee rights from NetWare directories and files.
* Depends on: net.h, c32ncp.h, trustee.h/trustee.c trustee helpers, netcall.c requester helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, trustee.h/trustee.c trustee helpers, netcall.c requester helpers, tools.c shared utility routines.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include "trustee.h"
#include <sys/types.h>
#include <sys/stat.h>

View File

@@ -19,11 +19,11 @@
/*
* Purpose: REVOKE utility for deleting trustee assignments from NetWare directories and files.
* Depends on: net.h, c32ncp.h, trustee.h/trustee.c trustee helpers, netcall.c requester helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, trustee.h/trustee.c trustee helpers, netcall.c requester helpers, tools.c shared utility routines.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include "trustee.h"
#ifndef _A_NORMAL

View File

@@ -19,11 +19,11 @@
/*
* Purpose: RIGHTS utility for displaying effective NetWare rights.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#include <dos.h>
#include <sys/types.h>
#include <sys/stat.h>

View File

@@ -19,7 +19,7 @@
/*
* Purpose: Shared trustee and rights helper implementation for GRANT, REMOVE and REVOKE style tools.
* Depends on: net.h, trustee.h, c32ncp.h callers, netcall.c requester helpers, tools.c shared utility routines.
* Depends on: net.h, trustee.h, ncpapi.h callers, netcall.c requester helpers, tools.c shared utility routines.
*/
#include "net.h"

View File

@@ -19,11 +19,11 @@
/*
* Purpose: WHOAMI utility for displaying the current NetWare login identity and context information.
* Depends on: net.h, c32ncp.h, netcall.c requester helpers, c32ncp.c namespace/NCP helpers, tools.c shared utility routines.
* Depends on: net.h, ncpapi.h, netcall.c requester helpers, ncpapi.c namespace/NCP helpers, tools.c shared utility routines.
*/
#include "net.h"
#include "c32ncp.h"
#include "ncpapi.h"
#define WHO_BINDERY_USER 0x0001
#define WHO_BINDERY_GROUP 0x0002