Overview
| Comment: | Add support for GNU/Hurd
Hurd does not have PATH_MAX, so different APIs need to be used on Hurd. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
6d93db9f986fdf6d9e2357bd06079fd1 |
| User & Date: | js on 2023-07-15 16:12:34 |
| Other Links: | manifest | tags |
Context
|
2023-07-15
| ||
| 16:23 | PLATFORMS.md: List C libraries for Linux check-in: cd8ac42607 user: js tags: trunk | |
| 16:12 | Add support for GNU/Hurd check-in: 6d93db9f98 user: js tags: trunk | |
| 15:03 | platform.h: Fix the define for HURD check-in: 41a9ba7c06 user: js tags: trunk | |
Changes
Modified src/OFFileIRIHandler.m from [06f45f3b90] to [624183587b].
| ︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #ifdef OF_WINDOWS # include <utime.h> #endif #ifdef OF_DJGPP # include <syslimits.h> #endif #ifdef HAVE_PWD_H # include <pwd.h> #endif #ifdef HAVE_GRP_H # include <grp.h> #endif | > > > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #ifdef OF_WINDOWS # include <utime.h> #endif #ifdef OF_DJGPP # include <syslimits.h> #endif #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #ifdef HAVE_PWD_H # include <pwd.h> #endif #ifdef HAVE_GRP_H # include <grp.h> #endif |
| ︙ | ︙ | |||
467 468 469 470 471 472 473 |
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
static void
setSymbolicLinkDestinationAttribute(OFMutableFileAttributes attributes,
OFIRI *IRI)
{
OFString *path = IRI.fileSystemRepresentation;
| | < < < < < < < < < < < < < < < < < < < < | 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 |
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
static void
setSymbolicLinkDestinationAttribute(OFMutableFileAttributes attributes,
OFIRI *IRI)
{
OFString *path = IRI.fileSystemRepresentation;
# ifdef OF_WINDOWS
HANDLE handle;
OFString *destination;
if (createSymbolicLinkWFuncPtr == NULL)
return;
if ((handle = CreateFileW(path.UTF16String, 0, (FILE_SHARE_READ |
|
| ︙ | ︙ | |||
538 539 540 541 542 543 544 545 546 547 548 549 550 551 |
forKey: OFFileType];
[attributes setObject: destination
forKey: OFFileSymbolicLinkDestination];
# undef slrb
} @finally {
CloseHandle(handle);
}
# endif
}
#endif
#ifdef OF_FILE_MANAGER_SUPPORTS_EXTENDED_ATTRIBUTES
static void
setExtendedAttributes(OFMutableFileAttributes attributes, OFIRI *IRI)
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 |
forKey: OFFileType];
[attributes setObject: destination
forKey: OFFileSymbolicLinkDestination];
# undef slrb
} @finally {
CloseHandle(handle);
}
# elif defined(OF_HURD)
OFStringEncoding encoding = [OFLocale encoding];
int fd;
OFMutableData *destinationData;
OFString *destination;
fd = open([path cStringWithEncoding: encoding], O_RDONLY | O_NOLINK);
if (fd == -1)
@throw [OFGetItemAttributesFailedException
exceptionWithIRI: IRI
errNo: errno];
@try {
char buffer[512];
ssize_t length;
destinationData = [OFMutableData data];
while ((length = read(fd, buffer, 512)) > 0)
[destinationData addItems: buffer count: length];
} @finally {
close(fd);
}
destination = [OFString stringWithCString: destinationData.items
encoding: encoding
length: destinationData.count];
[attributes setObject: destination
forKey: OFFileSymbolicLinkDestination];
# else
OFStringEncoding encoding = [OFLocale encoding];
char destinationC[PATH_MAX];
ssize_t length;
OFString *destination;
length = readlink([path cStringWithEncoding: encoding], destinationC,
PATH_MAX);
if (length < 0)
@throw [OFGetItemAttributesFailedException
exceptionWithIRI: IRI
errNo: errno];
destination = [OFString stringWithCString: destinationC
encoding: encoding
length: length];
[attributes setObject: destination
forKey: OFFileSymbolicLinkDestination];
# endif
}
#endif
#ifdef OF_FILE_MANAGER_SUPPORTS_EXTENDED_ATTRIBUTES
static void
setExtendedAttributes(OFMutableFileAttributes attributes, OFIRI *IRI)
|
| ︙ | ︙ |
Modified src/OFFileManager.m from [b37b88e7db] to [c425786752].
| ︙ | ︙ | |||
169 170 171 172 173 174 175 176 177 178 179 180 181 182 | @throw [OFOutOfRangeException exception]; return nil; } return [OFString stringWithCString: buffer encoding: [OFLocale encoding]]; # else char buffer[PATH_MAX]; if ((getcwd(buffer, PATH_MAX)) == NULL) @throw [OFGetCurrentDirectoryFailedException exceptionWithErrNo: errno]; | > > > > > > > > > > > > > > > > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
@throw [OFOutOfRangeException exception];
return nil;
}
return [OFString stringWithCString: buffer
encoding: [OFLocale encoding]];
# elif defined(OF_GLIBC)
char *buffer;
OFString *path;
if ((buffer = getcwd(NULL, 0)) == NULL)
@throw [OFGetCurrentDirectoryFailedException
exceptionWithErrNo: errno];
@try {
path = [OFString stringWithCString: buffer
encoding: [OFLocale encoding]];
} @finally {
free(buffer);
}
return path;
# else
char buffer[PATH_MAX];
if ((getcwd(buffer, PATH_MAX)) == NULL)
@throw [OFGetCurrentDirectoryFailedException
exceptionWithErrNo: errno];
|
| ︙ | ︙ |
Modified src/platform.h from [865115b836] to [d6a36db1b5].
| ︙ | ︙ | |||
150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | #elif defined(__riscos__) # define OF_ACORN_RISC_OS #elif defined(__MINT__) # define OF_MINT #elif defined(__gnu_hurd__) # define OF_HURD #endif #if defined(__ELF__) # define OF_ELF #elif defined(__MACH__) # define OF_MACH_O #endif #if defined(__PIC__) || defined(__pic__) # define OF_PIC #endif | > > > > | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | #elif defined(__riscos__) # define OF_ACORN_RISC_OS #elif defined(__MINT__) # define OF_MINT #elif defined(__gnu_hurd__) # define OF_HURD #endif #ifdef __GLIBC__ # define OF_GLIBC #endif #if defined(__ELF__) # define OF_ELF #elif defined(__MACH__) # define OF_MACH_O #endif #if defined(__PIC__) || defined(__pic__) # define OF_PIC #endif |