this repo has no description
Merge branch 'master' of github.com:darlinghq/darling into broken
+103
-4
+6
.gitmodules
+6
.gitmodules
···
242
242
[submodule "src/external/Heimdal"]
243
243
path = src/external/Heimdal
244
244
url = ../darling-Heimdal.git
245
+
[submodule "src/external/libtelnet"]
246
+
path = src/external/libtelnet
247
+
url = ../darling-libtelnet.git
248
+
[submodule "src/external/remote_cmds"]
249
+
path = src/external/remote_cmds
250
+
url = ../darling-remote_cmds.git
+3
-1
src/CMakeLists.txt
+3
-1
src/CMakeLists.txt
···
115
115
add_subdirectory(xtrace)
116
116
add_subdirectory(dyld)
117
117
add_subdirectory(external/objc4/runtime)
118
-
add_subdirectory(external/syslog/libsystem_asl.tproj)
118
+
add_subdirectory(external/syslog)
119
119
add_subdirectory(external/libdispatch)
120
120
add_subdirectory(external/zlib)
121
121
add_subdirectory(external/bzip2)
···
132
132
add_subdirectory(external/pcre)
133
133
add_subdirectory(external/sqlite)
134
134
add_subdirectory(external/openpam)
135
+
add_subdirectory(external/libtelnet)
136
+
add_subdirectory(external/remote_cmds)
135
137
add_subdirectory(SystemConfiguration)
136
138
add_subdirectory(CoreServices)
137
139
#add_subdirectory(ApplicationServices)
+24
-1
src/kernel/emulation/linux/network/recvmsg.c
+24
-1
src/kernel/emulation/linux/network/recvmsg.c
···
4
4
#include <linux-syscalls/linux.h>
5
5
#include <stddef.h>
6
6
#include "duct.h"
7
+
#include "getsockopt.h"
7
8
8
9
extern void *malloc(__SIZE_TYPE__ size);
9
10
extern void free(void* ptr);
···
70
71
if (lmsg.msg_controllen > 0)
71
72
{
72
73
bchdr->cmsg_len = lchdr->cmsg_len;
73
-
bchdr->cmsg_level = lchdr->cmsg_level;
74
+
bchdr->cmsg_level = socket_level_linux_to_bsd(lchdr->cmsg_level);
74
75
bchdr->cmsg_type = lchdr->cmsg_type;
75
76
76
77
// __simple_printf("Copy %p to %p, %d bytes (of %d)\n", lchdr->cmsg_data, bchdr->cmsg_data, lchdr->cmsg_len - sizeof(struct linux_cmsghdr), lchdr->cmsg_len);
···
98
99
}
99
100
100
101
102
+
int socket_level_bsd_to_linux(int level)
103
+
{
104
+
switch (level)
105
+
{
106
+
case BSD_SOL_SOCKET:
107
+
return LINUX_SOL_SOCKET;
108
+
default:
109
+
return level;
110
+
}
111
+
}
112
+
113
+
int socket_level_linux_to_bsd(int level)
114
+
{
115
+
switch (level)
116
+
{
117
+
case LINUX_SOL_SOCKET:
118
+
return BSD_SOL_SOCKET;
119
+
default:
120
+
return level;
121
+
}
122
+
}
123
+
+3
src/kernel/emulation/linux/network/recvmsg.h
+3
src/kernel/emulation/linux/network/recvmsg.h
···
44
44
long sys_recvmsg(int socket, struct bsd_msghdr* msg, int flags);
45
45
long sys_recvmsg_nocancel(int socket, struct bsd_msghdr* msg, int flags);
46
46
47
+
int socket_level_bsd_to_linux(int level);
48
+
int socket_level_linux_to_bsd(int level);
49
+
47
50
#define LINUX_SYS_RECVMSG 17
48
51
49
52
#endif
+1
-1
src/kernel/emulation/linux/network/sendmsg.c
+1
-1
src/kernel/emulation/linux/network/sendmsg.c
···
41
41
lmsg.msg_controllen = msg->msg_controllen + 4;
42
42
43
43
lchdr->cmsg_len = bchdr->cmsg_len;
44
-
lchdr->cmsg_level = bchdr->cmsg_level;
44
+
lchdr->cmsg_level = socket_level_bsd_to_linux(bchdr->cmsg_level);
45
45
lchdr->cmsg_type = bchdr->cmsg_type;
46
46
47
47
memcpy(lchdr->cmsg_data, bchdr->cmsg_data,
+1
-1
src/libinfo/gen.subproj/CMakeLists.txt
+1
-1
src/libinfo/gen.subproj/CMakeLists.txt
+5
src/libnotify/CMakeLists.txt
+5
src/libnotify/CMakeLists.txt
···
43
43
#target_link_libraries(system_notify system_c system_kernel system_blocks libdispatch_shared launch system_dyld system_malloc system_pthread)
44
44
#make_fat(system_notify)
45
45
46
+
add_darling_executable(notifyutil notifyutil/notifyutil.c)
47
+
46
48
install(TARGETS system_notify DESTINATION libexec/darling/usr/lib/system)
49
+
install(TARGETS notifyutil DESTINATION libexec/darling/usr/bin)
50
+
install(FILES notifyutil/notifyutil.1 DESTINATION libexec/darling/usr/share/man/man1)
47
51
52
+
add_subdirectory(notifyd)
+25
src/libnotify/notifyd/CMakeLists.txt
+25
src/libnotify/notifyd/CMakeLists.txt
···
1
+
project(notifyd)
2
+
3
+
include_directories(
4
+
${CMAKE_SOURCE_DIR}/src/external/syslog/libsystem_asl.tproj/include
5
+
${CMAKE_SOURCE_DIR}/src/libc/stdtime/FreeBSD
6
+
)
7
+
8
+
mig(../notify_ipc.defs)
9
+
set(notifyd_sources
10
+
notifyd.c
11
+
notify_proc.c
12
+
pathwatch.c
13
+
service.c
14
+
timer.c
15
+
${CMAKE_CURRENT_BINARY_DIR}/../notify_ipcServer.c
16
+
)
17
+
18
+
add_darling_executable(notifyd ${notifyd_sources})
19
+
target_link_libraries(notifyd system)
20
+
21
+
install(TARGETS notifyd DESTINATION libexec/darling/usr/sbin)
22
+
install(FILES com.apple.notifyd.plist DESTINATION libexec/darling/System/Library/LaunchDaemons)
23
+
install(FILES notifyd.8 DESTINATION libexec/darling/usr/share/man/man8)
24
+
install(FILES notify.conf.MacOSX RENAME notify.conf DESTINATION libexec/darling/etc)
25
+
+28
src/quarantine/quarantine.c
+28
src/quarantine/quarantine.c
···
115
115
{
116
116
return QTN_NOT_QUARANTINED;
117
117
}
118
+
119
+
struct _qtn_proc_t
120
+
{
121
+
int dummy;
122
+
};
123
+
124
+
qtn_proc_t qtn_proc_alloc(void)
125
+
{
126
+
return (qtn_proc_t) malloc(sizeof(qtn_proc_t));
127
+
}
128
+
129
+
void qtn_proc_set_identifier(qtn_proc_t proc, const char* ident)
130
+
{
131
+
}
132
+
133
+
void qtn_proc_set_flags(qtn_proc_t proc, unsigned int flags)
134
+
{
135
+
}
136
+
137
+
void qtn_proc_apply_to_self(qtn_proc_t proc)
138
+
{
139
+
}
140
+
141
+
void qtn_proc_free(qtn_proc_t proc)
142
+
{
143
+
free(proc);
144
+
}
145
+
+7
src/quarantine/quarantine.h
+7
src/quarantine/quarantine.h
···
53
53
extern int __esp_check_ns(const char *a, void *b);
54
54
extern int __esp_notify_ns(const char *a, void *b);
55
55
56
+
typedef struct _qtn_proc_t* qtn_proc_t;
57
+
qtn_proc_t qtn_proc_alloc(void);
58
+
void qtn_proc_set_identifier(qtn_proc_t proc, const char* ident);
59
+
void qtn_proc_set_flags(qtn_proc_t proc, unsigned int flags);
60
+
void qtn_proc_apply_to_self(qtn_proc_t proc);
61
+
void qtn_proc_free(qtn_proc_t proc);
62
+
56
63
#define QTN_SERIALIZED_DATA_MAX 4096
57
64
58
65
#define qtn_file_alloc _qtn_file_alloc