i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/lib: Use the hostname.cpp from libroot.

Browse Source 
The libroot version contains one minor bugfix but otherwise is the same.
This commit is contained in:
Augustin Cavalier
2025-07-29 17:29:03 -04:00
parent 43db356db7
commit f2370e7654
3 changed files with 1 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/lib/Jamfile
+1
View File
@@ -106,6 +106,7 @@ KernelMergeObject kernel_lib_posix.o :
close.c
directory.c
dup.c
hostname.cpp
ioctl.c
link.c
lseek.c
src/system/kernel/util/Jamfile
-1
View File
@@ -6,7 +6,6 @@ KernelMergeObject kernel_util.o :
AVLTreeBase.cpp
Bitmap.cpp
convertutf.cpp
hostname.cpp
inet_addr.c
inet_ntop.c
kernel_cpp.cpp
src/system/kernel/util/hostname.cpp
-92
View File
@@ -1,92 +0,0 @@
/*
* Copyright 2002-2007, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
#include <FindDirectory.h>
#include <StorageDefs.h>
#include <errno_private.h>
#include <find_directory_private.h>
static status_t
get_path(char *path, bool create)
{
status_t status = __find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, create,
path, B_PATH_NAME_LENGTH);
if (status != B_OK)
return status;
strlcat(path, "/network", B_PATH_NAME_LENGTH);
if (create)
mkdir(path, 0755);
strlcat(path, "/hostname", B_PATH_NAME_LENGTH);
return B_OK;
}
extern "C" int
sethostname(const char *hostName, size_t nameSize)
{
char path[B_PATH_NAME_LENGTH];
if (get_path(path, false) != B_OK) {
__set_errno(B_ERROR);
return -1;
}
int file = open(path, O_WRONLY | O_CREAT, 0644);
if (file < 0)
return -1;
nameSize = min_c(nameSize, MAXHOSTNAMELEN);
if (write(file, hostName, nameSize) != (ssize_t)nameSize
|| write(file, "\n", 1) != 1) {
close(file);
return -1;
}
close(file);
return 0;
}
extern "C" int
gethostname(char *hostName, size_t nameSize)
{
// look up hostname from network settings hostname file
char path[B_PATH_NAME_LENGTH];
if (get_path(path, false) != B_OK) {
__set_errno(B_ERROR);
return -1;
}
int file = open(path, O_RDONLY);
if (file < 0)
return -1;
nameSize = min_c(nameSize, MAXHOSTNAMELEN);
int length = read(file, hostName, nameSize - 1);
close(file);
if (length < 0)
return -1;
hostName[length] = '\0';
char *end = strpbrk(hostName, "\r\n\t");
if (end != NULL)
end[0] = '\0';
return 0;
}