github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-09 20:18:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #540 from Interlisp/nhb-string-handling-cleanup

Browse Source
This commit is contained in:
Nick Briggs
2025-08-10 09:55:25 -07:00
committed by GitHub
parent 428e7cf1a2 c9e2759666
commit f0bd8e0f1f
14 changed files with 103 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/makefile-tail
View File

@@ -674,7 +674,7 @@ $(OBJECTDIR)initsout.o: $(SRCDIR)initsout.c $(REQUIRED-INCS) \
$(OBJECTDIR)kbdsubrs.o: $(SRCDIR)kbdsubrs.c $(REQUIRED-INCS) \
$(INCDIR)lispemul.h $(INCDIR)kbdsubrsdefs.h \
$(INCDIR)commondefs.h $(INCDIR)lisp2cdefs.h $(INCDIR)xwinmandefs.h \
$(INCDIR)commondefs.h $(INCDIR)xwinmandefs.h \
$(INCDIR)devif.h
$(CC) $(RFLAGS) $(SRCDIR)kbdsubrs.c -o $(OBJECTDIR)kbdsubrs.o

148
inc/locfile.h
View File

@@ -12,6 +12,7 @@
#include <limits.h> /* for NAME_MAX */
#include <dirent.h> /* for MAXNAMLEN */
#include "lispemul.h" /* for DLword */
#include "commondefs.h" /* for error */
#define FDEV_PAGE_SIZE 512 /* 1 page == 512 byte */
@@ -44,18 +45,17 @@
/* For getfileinfo. For WDATE&RDATE */
/* 29969152 == (timer.c)LISP_UNIX_TIME_DIFF */
#define StrNCpyFromCToLisp(lispbuf, cbuf ,len) do { \
char *lf_sptr = (cbuf); \
char *lf_dptr = (lispbuf); \
for(size_t lf_i=0;lf_i<(len);lf_i++)\
GETBYTE(lf_dptr++) = *lf_sptr++; \
} while (0)
#define StrNCpyFromLispToC(cbuf , lispbuf, len) do { \
char *lf_sptr = (lispbuf); \
char *lf_dptr = (cbuf); \
for(size_t lf_i=0;lf_i<(len);lf_i++)\
*lf_dptr++ = GETBYTE(lf_sptr++); \
/*
* Copy memory between native memory locations accounting for potential
* byte-swapping necessary when then destination is within Lisp memory space
* though the provided destination pointer is a native address within the
* Lisp space.
*/
#define MemCpyToLispFromNative(lispbuf, cbuf, len) \
do { \
char *lf_sptr = (cbuf); \
char *lf_dptr = (lispbuf); \
for (size_t lf_i = 0; lf_i < (len); lf_i++) *BYTEPTR(lf_dptr++) = *lf_sptr++; \
} while (0)
#define FGetNum(ptr, place) do { \
@@ -64,6 +64,10 @@
else {return(NIL);}} while (0)
#ifndef min
#define min(a, b) (((a) <= (b))?(a):(b))
#endif /* min */
/************************************************************************/
/* */
/* L i s p S t r i n g T o C S t r i n g */
@@ -79,65 +83,52 @@
/* */
/************************************************************************/
#ifndef BYTESWAP
#define LispStringToCString(Lisp, C, MaxLen) \
do { \
OneDArray *lf_arrayp; \
char *lf_base, *lf_dp; \
short *lf_sbase; \
size_t lf_length; \
lf_arrayp = (OneDArray *)NativeAligned4FromLAddr(Lisp); \
lf_length = min(MaxLen, lf_arrayp->fillpointer); \
switch(lf_arrayp->typenumber) \
{ \
case THIN_CHAR_TYPENUMBER: \
lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base))) \
+ ((int)(lf_arrayp->offset)); \
strncpy(C, lf_base, lf_length); \
(C)[lf_length] = '\0'; \
break; \
\
case FAT_CHAR_TYPENUMBER: \
lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base))) \
+ ((int)(lf_arrayp->offset)); \
lf_dp = C; \
for(size_t lf_i=0;lf_i<(lf_length);lf_i++) \
*lf_dp++ = (char)(*lf_sbase++); \
*lf_dp = '\0'; \
break; \
default: \
error("LispStringToCString: Not a character array.\n"); \
} \
} while (0)
static void LispStringToCString(LispPTR Lisp, char *C, size_t MaxLen) {
OneDArray *lf_arrayp;
char *lf_base, *lf_dp;
short *lf_sbase;
size_t lf_length;
lf_arrayp = (OneDArray *)NativeAligned4FromLAddr(Lisp);
lf_length = min(MaxLen - 1, lf_arrayp->fillpointer);
lf_dp = (C);
switch (lf_arrayp->typenumber) {
case THIN_CHAR_TYPENUMBER:
lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base))) + ((int)(lf_arrayp->offset));
strncpy(lf_dp, lf_base, lf_length);
lf_dp[lf_length] = '\0';
break;
case FAT_CHAR_TYPENUMBER:
lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base))) + ((int)(lf_arrayp->offset));
for (size_t lf_i = 0; lf_i < (lf_length); lf_i++) *lf_dp++ = (char)(*lf_sbase++);
*lf_dp = '\0';
break;
default: error("LispStringToCString: Not a character array.\n");
}
}
#else /* BYTESWAP == T CHANGED-BY-TAKE */
#define LispStringToCString(Lisp, C, MaxLen) \
do { \
OneDArray *lf_arrayp; \
char *lf_base, *lf_dp; \
short *lf_sbase; \
size_t lf_length; \
lf_arrayp = (OneDArray *)(NativeAligned4FromLAddr(Lisp)); \
lf_length = min(MaxLen, lf_arrayp->fillpointer); \
switch(lf_arrayp->typenumber) \
{ \
case THIN_CHAR_TYPENUMBER: \
lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base))) \
+ ((int)(lf_arrayp->offset)); \
StrNCpyFromLispToC(C , lf_base , lf_length ); \
(C)[lf_length] = '\0'; \
break; \
\
case FAT_CHAR_TYPENUMBER: \
lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base))) \
+ ((int)(lf_arrayp->offset)); \
lf_dp = C; \
for(size_t lf_ii=0;lf_ii<(lf_length);lf_ii++,lf_sbase++) \
*lf_dp++ = (char)(GETWORD(lf_sbase)); \
*lf_dp = '\0'; \
break; \
default: \
error("LispStringToCString: Not a character array.\n"); \
} \
} while (0)
static void LispStringToCString(LispPTR Lisp, char *C, size_t MaxLen) {
OneDArray *lf_arrayp;
char *lf_base, *lf_dp;
short *lf_sbase;
size_t lf_length;
lf_arrayp = (OneDArray *)(NativeAligned4FromLAddr(Lisp));
lf_length = min(MaxLen - 1, lf_arrayp->fillpointer);
lf_dp = (C);
switch (lf_arrayp->typenumber) {
case THIN_CHAR_TYPENUMBER:
lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base))) + ((int)(lf_arrayp->offset));
for (size_t lf_i = 0; lf_i < lf_length; lf_i++) *lf_dp++ = GETBYTE(lf_base++);
break;
case FAT_CHAR_TYPENUMBER:
lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base))) + ((int)(lf_arrayp->offset));
for (size_t lf_ii = 0; lf_ii < lf_length; lf_ii++) *lf_dp++ = (char)(GETWORD(lf_sbase++));
break;
default: error("LispStringToCString: Not a character array.\n");
}
*lf_dp = '\0';
}
#endif /* BYTESWAP */
@@ -189,10 +180,6 @@ do { \
(cstringp) = (char *)(NativeAligned2FromLAddr(((OneDArray *)lf_naddress)->base)); \
} while (0)
#ifndef min
#define min(a, b) (((a) <= (b))?(a):(b))
#endif /* min */
#define LispNumToCInt(Lisp) \
( (((Lisp) & SEGMASK) == S_POSITIVE) ? ((Lisp) & 0xFFFF) : \
(((Lisp) & SEGMASK) == S_NEGATIVE) ? ((Lisp) | 0xFFFF0000) : \
@@ -299,7 +286,7 @@ do { \
* Argument: char *pathname
* Xerox Lisp syntax pathname.
*
* Value: If succeed, returns 1, otherwise 0.
* Value: On success returns 1, otherwise 0.
*
* Side Effect: The version part of pathname is destructively modified.
*
@@ -312,7 +299,7 @@ do { \
* code.
* This macro should be called at the top of the routines which accept the
* file name from lisp before converting it into UNIX file name, because
* locating the version part, the informations about quoted characters are needed.
* locating the version part, the information about quoted characters are needed.
* They might be lost in the course of the conversion.
*
*/
@@ -337,19 +324,18 @@ do { \
* If 0, versionless file is converted to version 1.
* Otherwise, remains as versionless.
*
* Value: If succeed, returns 1, otherwise 0.
* Value: On success returns 1, otherwise 0.
*
* Side Effect: The version part of pathname is destructively modified.
*
* Description:
*
* Destructively modify the version part of pathname which is following the
* Destructively modifies the version part of pathname which is following the
* UNIX file naming convention to Xerox Lisp one.
* This macro should be called, in the routines which convert the UNIX pathname
* to Lisp one, just before it returns the result to Lisp, because converting
* version field will append a semicolon and it might make the routine be
* confused.
* The file which has not a valid version field, that is ".~##~" form, is
* version field will append a semicolon which may confuse the routine
* The file which does not have a valid version field, that is ".~##~" form, is
* dealt with as version 1.
*/

3
inc/vmemsavedefs.h
View File

@@ -1,7 +1,6 @@
#ifndef VMEMSAVEDEFS_H
#define VMEMSAVEDEFS_H 1
#include "lispemul.h" /* for LispPTR, DLword */
int lispstringP(LispPTR Lisp);
#include "lispemul.h" /* for LispPTR */
LispPTR vmem_save(char *sysout_file_name);
LispPTR vmem_save0(LispPTR *args);
void lisp_finish(int exit_status);

4
src/dir.c
View File

@@ -2159,7 +2159,7 @@ LispPTR COM_next_file(LispPTR *args)
#ifndef BYTESWAP
strncpy(base, fp->lname, fp->lname_len);
#else
StrNCpyFromCToLisp(base, fp->lname, fp->lname_len);
MemCpyToLispFromNative(base, fp->lname, fp->lname_len);
#endif /* BYTESWAP */
if (!propp) return (GetPosSmallp(fp->lname_len));
@@ -2175,7 +2175,7 @@ LispPTR COM_next_file(LispPTR *args)
#ifndef BYTESWAP
strncpy(base, pp->author, pp->au_len);
#else
StrNCpyFromCToLisp(base, pp->author, pp->au_len);
MemCpyToLispFromNative(base, pp->author, pp->au_len);
#endif /* BYTESWAP */
gfsp->aulen = pp->au_len;

16
src/dsk.c
View File

@@ -1032,9 +1032,9 @@ LispPTR DSK_getfilename(LispPTR *args)
len = strlen(lfname);
#ifndef BYTESWAP
strncpy(base, lfname, len + 1);
strncpy(base, lfname, len);
#else
StrNCpyFromCToLisp(base, lfname, len + 1);
MemCpyToLispFromNative(base, lfname, len);
#endif /* BYTESWAP */
return (GetPosSmallp(len));
@@ -1068,9 +1068,9 @@ LispPTR DSK_getfilename(LispPTR *args)
len = strlen(lfname);
#ifndef BYTESWAP
strncpy(base, lfname, len + 1);
strncpy(base, lfname, len);
#else
StrNCpyFromCToLisp(base, lfname, len + 1);
MemCpyToLispFromNative(base, lfname, len);
#endif /* BYTESWAP */
return (GetPosSmallp(len));
@@ -1507,9 +1507,9 @@ LispPTR DSK_directorynamep(LispPTR *args)
STRING_BASE(args[1], base);
#ifndef BYTESWAP
strncpy(base, dirname, len + 1);
strncpy(base, dirname, len);
#else
StrNCpyFromCToLisp(base, dirname, len + 1);
MemCpyToLispFromNative(base, dirname, len);
#endif /* BYTESWAP */
return (GetPosSmallp(len));
@@ -1671,7 +1671,7 @@ LispPTR COM_getfileinfo(LispPTR *args)
#ifndef BYTESWAP
strncpy(base, pwd->pw_name, len);
#else
StrNCpyFromCToLisp(base, pwd->pw_name, len);
MemCpyToLispFromNative(base, pwd->pw_name, len);
#endif /* BYTESWAP */
#endif /* DOS */
return (GetPosSmallp(len));
@@ -1710,7 +1710,7 @@ LispPTR COM_getfileinfo(LispPTR *args)
#ifndef BYTESWAP
strncpy(base, pwd->pw_name, len);
#else
StrNCpyFromCToLisp(base, pwd->pw_name, len);
MemCpyToLispFromNative(base, pwd->pw_name, len);
#endif /* BYTESWAP */
#endif /* DOS */
return (GetPosSmallp(len));

4
src/ether_nethub.c
View File

@@ -468,7 +468,7 @@ LispPTR ether_get(LispPTR args[])
log_debug(("ether_get() - begin\n"));
target = (u_char *)NativeAligned2FromLAddr(args[1]);
maxByteCount = 2 * LispIntToCInt(args[0]); /* words to bytes */
maxByteCount = BYTESPER_DLWORD * LispIntToCInt(args[0]); /* words to bytes */
log_debug((" target = %p maxBytecount: %d bytes\n", (void *)target, maxByteCount));
ether_buf = target;
@@ -501,7 +501,7 @@ LispPTR ether_send(LispPTR args[])
log_debug(("ether_send() - begin\n"));
u_char *source = (u_char *)NativeAligned2FromLAddr(args[1]);
int byteCount = 2 * LispIntToCInt(args[0]); /* words to bytes */
int byteCount = BYTESPER_DLWORD * LispIntToCInt(args[0]); /* words to bytes */
log_debug((" source = %p , bytecount: %d bytes\n", (void *)source, byteCount));

4
src/ether_sunos.c
View File

@@ -366,7 +366,7 @@ LispPTR ether_get(LispPTR args[])
LispPTR MaxByteCount;
sigset_t signals;
MaxByteCount = 2 * (0xFFFF & args[0]); /* words to bytes */
MaxByteCount = BYTERSPER_DLWORD * (0xFFFF & args[0]); /* words to bytes */
DBPRINT(("Ether Get. "));
@@ -408,7 +408,7 @@ LispPTR ether_send(LispPTR args[])
LispPTR MaxByteCount;
u_char *BufferAddr; /* buffer address pointer(in native address) */
MaxByteCount = 2 * (0xFFFF & args[0]); /* words to bytes */
MaxByteCount = BYTESPER_DLWORD * (0xFFFF & args[0]); /* words to bytes */
BufferAddr = (u_char *)NativeAligned2FromLAddr(args[1]);
if (ether_fd > 0) {

1
src/kbdsubrs.c
View File

@@ -28,7 +28,6 @@
#include "kbdsubrsdefs.h"
#include "commondefs.h"
#ifdef XWINDOW
#include "lisp2cdefs.h"
#include "xwinmandefs.h"
#endif

10
src/kprint.c
View File

@@ -98,10 +98,12 @@ void prindatum(LispPTR x) {
break;
case TYPE_ONED_ARRAY:
case TYPE_GENERAL_ARRAY:
/* this should probably use array.h's arrayheader */
newstring = (NEWSTRINGP *)NativeAligned4FromLAddr(x);
if (newstring->stringp) {
print_NEWstring(x);
}
/* it would be useful to print non-string arrays, too */
break;
default: dtd_base = (struct dtd *)GetDTD(typen); printf("{");
#ifdef BIGVM
@@ -173,14 +175,20 @@ void print_string(LispPTR x) {
void print_NEWstring(LispPTR x) {
NEWSTRINGP *string_point;
DLword st_length;
DLword st_offset;
DLbyte *string_base;
int i;
string_point = (NEWSTRINGP *)NativeAligned4FromLAddr(x);
st_length = string_point->fillpointer;
st_offset = string_point->offset;
if (string_point->indirectp) {
/* base points to another array header not the raw storage */
string_point = (NEWSTRINGP *)NativeAligned4FromLAddr(string_point->base);
}
string_base = (DLbyte *)NativeAligned2FromLAddr(string_point->base);
string_base += string_point->offset;
string_base += st_offset;
printf("%c", DOUBLEQUOTE); /* print %" */

4
src/ldsout.c
View File

@@ -216,8 +216,8 @@ unsigned sysout_loader(const char *sysout_file_name, unsigned sys_size) {
}
if ((stat_buf.st_size & (BYTESPER_PAGE - 1)) != 0)
printf("CAUTION::not an integral number of pages. sysout & 0x1ff = 0x%x\n",
(int)(stat_buf.st_size & (BYTESPER_PAGE - 1)));
printf("CAUTION::not an integral number of pages. sysout & 0x%x = 0x%x\n",
BYTESPER_PAGE - 1, (int)(stat_buf.st_size & (BYTESPER_PAGE - 1)));
if (ifpage.nactivepages != (sysout_size / 2)) {
printf("sysout_loader:IFPAGE says sysout size is %d\n", ifpage.nactivepages);

2
src/lisp2c.c
View File

@@ -38,6 +38,8 @@ int LispStringSimpleLength(LispPTR lispstring) {
return (arrayp->fillpointer);
}
/* XXX: this string conversion is NOT useable on byte-swapped (little-endian) machines
*/
void LispStringToCStr(LispPTR lispstring, char *cstring) {
OneDArray *arrayp;
char *base;

6
src/osmsg.c
View File

@@ -233,15 +233,13 @@ LispPTR mess_read(LispPTR *args)
struct stat sbuf;
int size, save_size;
char *base;
LispPTR *naddress;
int i;
static char temp_buf[MESSAGE_BUFFER_SIZE];
SETJMP(NIL);
/* Get buff address from LISP */
naddress = (LispPTR *)(NativeAligned4FromLAddr(args[0]));
base = (char *)(NativeAligned2FromLAddr(((OneDArray *)naddress)->base));
STRING_BASE(args[0], base);
close(log_id);
TIMEOUT(log_id = open(logfile, O_RDONLY));
@@ -283,7 +281,7 @@ LispPTR mess_read(LispPTR *args)
if (temp_buf[i] == '\n') temp_buf[i] = '\000';
}
/* COPY actual Lisp Buffer(for BYTESWAP magic) */
StrNCpyFromCToLisp(base, temp_buf, size);
MemCpyToLispFromNative(base, temp_buf, size);
return (GetSmallp(size));
#else

8
src/ufs.c
View File

@@ -216,9 +216,9 @@ LispPTR UFS_getfilename(LispPTR *args)
len = strlen(lfname);
#ifndef BYTESWAP
strncpy(base, lfname, len + 1);
strncpy(base, lfname, len);
#else
StrNCpyFromCToLisp(base, lfname, len + 1);
MemCpyToLispFromNative(base, lfname, len);
#endif /* BYTESWAP */
return (GetSmallp(len));
@@ -420,9 +420,9 @@ LispPTR UFS_directorynamep(LispPTR *args)
STRING_BASE(args[1], base);
#ifndef BYTESWAP
strncpy(base, dirname, len + 1);
strncpy(base, dirname, len);
#else
StrNCpyFromCToLisp(base, dirname, len + 1);
MemCpyToLispFromNative(base, dirname, len);
#endif /* BYTESWAP */
return (GetSmallp(len));

2
src/vmemsave.c
View File

@@ -92,7 +92,7 @@ extern int please_fork;
/* */
/************************************************************************/
int lispstringP(LispPTR Lisp)
static int lispstringP(LispPTR Lisp)
{
switch (((OneDArray *)(NativeAligned4FromLAddr(Lisp)))->typenumber) {
case THIN_CHAR_TYPENUMBER: