Raymond Toy pushed to branch issue-125-unix-stat-wrong at cmucl / cmucl
Commits:
-
34a975ee
by Raymond Toy at 2022-08-03T13:02:19-07:00
1 changed file:
Changes:
... | ... | @@ -53,12 +53,9 @@ |
53 | 53 | (def-alien-type u-int32-t unsigned-int)
|
54 | 54 | |
55 | 55 | (def-alien-type ino-t
|
56 | - #+netbsd u-int64-t
|
|
56 | + #+(or netbsd linux darwin) u-int64-t
|
|
57 | 57 | #+alpha unsigned-int
|
58 | - #-(or alpha netbsd) unsigned-long)
|
|
59 | - |
|
60 | -#+linux
|
|
61 | -(def-alien-type ino64-t u-int64-t)
|
|
58 | + #-(or alpha netbsd linux darwin) unsigned-long)
|
|
62 | 59 | |
63 | 60 | (def-alien-type size-t
|
64 | 61 | #-(or linux alpha) long
|
... | ... | @@ -1300,7 +1297,7 @@ |
1300 | 1297 | #+glibc2.1
|
1301 | 1298 | (d-ino ino-t) ; inode number of entry
|
1302 | 1299 | #-glibc2.1
|
1303 | - (d-ino ino64-t) ; inode number of entry
|
|
1300 | + (d-ino ino-t) ; inode number of entry
|
|
1304 | 1301 | (d-off off-t) ; offset of next disk directory entry
|
1305 | 1302 | (d-reclen unsigned-short) ; length of this record
|
1306 | 1303 | (d_type unsigned-char)
|
... | ... | @@ -1346,15 +1343,16 @@ |
1346 | 1343 | (d-name (array char 256)))) ; name must be no longer than this
|
1347 | 1344 | |
1348 | 1345 | |
1346 | +;; unix-stat and friends
|
|
1349 | 1347 | (macrolet
|
1350 | 1348 | ((call-stat (c-func-name first-arg-type first-arg)
|
1351 | 1349 | ;; Call the stat function named C-FUNC-NAME. The type of the
|
1352 | - ;; first arg is FIRST-ARG_TYPE and FIRST-ARG is the first arg
|
|
1350 | + ;; first arg is FIRST-ARG-TYPE and FIRST-ARG is the first arg
|
|
1353 | 1351 | ;; to the stat function. fstat is different from stat and
|
1354 | 1352 | ;; lstat since it takes an fd for the first arg instead of
|
1355 | 1353 | ;; string.
|
1356 | 1354 | `(with-alien ((dev dev-t)
|
1357 | - (ino ino64-t)
|
|
1355 | + (ino ino-t)
|
|
1358 | 1356 | (mode mode-t)
|
1359 | 1357 | (nlink nlink-t)
|
1360 | 1358 | (uid uid-t)
|
... | ... | @@ -1372,7 +1370,7 @@ |
1372 | 1370 | (function int
|
1373 | 1371 | ,first-arg-type
|
1374 | 1372 | (* dev-t)
|
1375 | - (* ino64-t)
|
|
1373 | + (* ino-t)
|
|
1376 | 1374 | (* mode-t)
|
1377 | 1375 | (* nlink-t)
|
1378 | 1376 | (* uid-t)
|