Skip to content

Commit 5343b12

Browse files
committed
Eliminates nul at end of Lisp string since Lisp strings are not nul terminated
1 parent a0e7036 commit 5343b12

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/dsk.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,9 +1032,9 @@ LispPTR DSK_getfilename(LispPTR *args)
10321032
len = strlen(lfname);
10331033

10341034
#ifndef BYTESWAP
1035-
strncpy(base, lfname, len + 1);
1035+
strncpy(base, lfname, len);
10361036
#else
1037-
MemCpyToLispFromNative(base, lfname, len + 1);
1037+
MemCpyToLispFromNative(base, lfname, len);
10381038
#endif /* BYTESWAP */
10391039

10401040
return (GetPosSmallp(len));
@@ -1068,9 +1068,9 @@ LispPTR DSK_getfilename(LispPTR *args)
10681068
len = strlen(lfname);
10691069

10701070
#ifndef BYTESWAP
1071-
strncpy(base, lfname, len + 1);
1071+
strncpy(base, lfname, len);
10721072
#else
1073-
MemCpyToLispFromNative(base, lfname, len + 1);
1073+
MemCpyToLispFromNative(base, lfname, len);
10741074
#endif /* BYTESWAP */
10751075

10761076
return (GetPosSmallp(len));
@@ -1507,9 +1507,9 @@ LispPTR DSK_directorynamep(LispPTR *args)
15071507
STRING_BASE(args[1], base);
15081508

15091509
#ifndef BYTESWAP
1510-
strncpy(base, dirname, len + 1);
1510+
strncpy(base, dirname, len);
15111511
#else
1512-
MemCpyToLispFromNative(base, dirname, len + 1);
1512+
MemCpyToLispFromNative(base, dirname, len);
15131513
#endif /* BYTESWAP */
15141514

15151515
return (GetPosSmallp(len));

src/ufs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ LispPTR UFS_getfilename(LispPTR *args)
216216
len = strlen(lfname);
217217

218218
#ifndef BYTESWAP
219-
strncpy(base, lfname, len + 1);
219+
strncpy(base, lfname, len);
220220
#else
221-
MemCpyToLispFromNative(base, lfname, len + 1);
221+
MemCpyToLispFromNative(base, lfname, len);
222222
#endif /* BYTESWAP */
223223

224224
return (GetSmallp(len));
@@ -420,9 +420,9 @@ LispPTR UFS_directorynamep(LispPTR *args)
420420
STRING_BASE(args[1], base);
421421

422422
#ifndef BYTESWAP
423-
strncpy(base, dirname, len + 1);
423+
strncpy(base, dirname, len);
424424
#else
425-
MemCpyToLispFromNative(base, dirname, len + 1);
425+
MemCpyToLispFromNative(base, dirname, len);
426426
#endif /* BYTESWAP */
427427

428428
return (GetSmallp(len));

0 commit comments

Comments
 (0)