diff options
author | ng0 <ng0@n0.is> | 2019-09-09 19:17:18 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-09 19:17:18 +0000 |
commit | 483b0139a218a5f8a8311bda3eb23bcd88f57688 (patch) | |
tree | d9e7a0f5053cdaa1a720485b93e9927f08466958 /src/transport | |
parent | ec472b1aae122481f4f7e760e5242753eba9bf87 (diff) | |
download | gnunet-483b0139a218a5f8a8311bda3eb23bcd88f57688.tar.gz gnunet-483b0139a218a5f8a8311bda3eb23bcd88f57688.zip |
Remove win32 and cygwin support
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/tcp_service_legacy.c | 11 | ||||
-rw-r--r-- | src/transport/transport-testing-filenames.c | 19 |
2 files changed, 4 insertions, 26 deletions
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c index f1821a17b..8f3f43718 100644 --- a/src/transport/tcp_service_legacy.c +++ b/src/transport/tcp_service_legacy.c | |||
@@ -335,11 +335,10 @@ check_access(void *cls, | |||
335 | (!check_ipv6_listed(sctx->v6_denied, &i6->sin6_addr))); | 335 | (!check_ipv6_listed(sctx->v6_denied, &i6->sin6_addr))); |
336 | break; | 336 | break; |
337 | 337 | ||
338 | #ifndef WINDOWS | ||
339 | case AF_UNIX: | 338 | case AF_UNIX: |
340 | ret = GNUNET_OK; /* controlled using file-system ACL now */ | 339 | ret = GNUNET_OK; /* controlled using file-system ACL now */ |
341 | break; | 340 | break; |
342 | #endif | 341 | |
343 | default: | 342 | default: |
344 | LOG(GNUNET_ERROR_TYPE_WARNING, | 343 | LOG(GNUNET_ERROR_TYPE_WARNING, |
345 | _("Unknown address family %d\n"), | 344 | _("Unknown address family %d\n"), |
@@ -1203,7 +1202,7 @@ service_task(void *cls) | |||
1203 | sctx->ret = GNUNET_SYSERR; | 1202 | sctx->ret = GNUNET_SYSERR; |
1204 | return; | 1203 | return; |
1205 | } | 1204 | } |
1206 | #ifndef WINDOWS | 1205 | |
1207 | if (NULL != sctx->addrs) | 1206 | if (NULL != sctx->addrs) |
1208 | for (i = 0; NULL != sctx->addrs[i]; i++) | 1207 | for (i = 0; NULL != sctx->addrs[i]; i++) |
1209 | if ((AF_UNIX == sctx->addrs[i]->sa_family) && | 1208 | if ((AF_UNIX == sctx->addrs[i]->sa_family) && |
@@ -1213,8 +1212,6 @@ service_task(void *cls) | |||
1213 | ->sun_path, | 1212 | ->sun_path, |
1214 | sctx->match_uid, | 1213 | sctx->match_uid, |
1215 | sctx->match_gid); | 1214 | sctx->match_gid); |
1216 | #endif | ||
1217 | |||
1218 | 1215 | ||
1219 | if (0 == (sctx->options & LEGACY_SERVICE_OPTION_MANUAL_SHUTDOWN)) | 1216 | if (0 == (sctx->options & LEGACY_SERVICE_OPTION_MANUAL_SHUTDOWN)) |
1220 | { | 1217 | { |
@@ -1647,7 +1644,7 @@ LEGACY_SERVICE_start(const char *service_name, | |||
1647 | LEGACY_SERVICE_stop(sctx); | 1644 | LEGACY_SERVICE_stop(sctx); |
1648 | return NULL; | 1645 | return NULL; |
1649 | } | 1646 | } |
1650 | #ifndef WINDOWS | 1647 | |
1651 | if (NULL != sctx->addrs) | 1648 | if (NULL != sctx->addrs) |
1652 | for (i = 0; NULL != sctx->addrs[i]; i++) | 1649 | for (i = 0; NULL != sctx->addrs[i]; i++) |
1653 | if ((AF_UNIX == sctx->addrs[i]->sa_family) && | 1650 | if ((AF_UNIX == sctx->addrs[i]->sa_family) && |
@@ -1657,7 +1654,7 @@ LEGACY_SERVICE_start(const char *service_name, | |||
1657 | ->sun_path, | 1654 | ->sun_path, |
1658 | sctx->match_uid, | 1655 | sctx->match_uid, |
1659 | sctx->match_gid); | 1656 | sctx->match_gid); |
1660 | #endif | 1657 | |
1661 | sctx->my_handlers = GNUNET_malloc(sizeof(defhandlers)); | 1658 | sctx->my_handlers = GNUNET_malloc(sizeof(defhandlers)); |
1662 | GNUNET_memcpy(sctx->my_handlers, defhandlers, sizeof(defhandlers)); | 1659 | GNUNET_memcpy(sctx->my_handlers, defhandlers, sizeof(defhandlers)); |
1663 | i = 0; | 1660 | i = 0; |
diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c index 865907007..8d493864e 100644 --- a/src/transport/transport-testing-filenames.c +++ b/src/transport/transport-testing-filenames.c | |||
@@ -40,25 +40,6 @@ extract_filename(const char *file) | |||
40 | char *filename = NULL; | 40 | char *filename = NULL; |
41 | char *res; | 41 | char *res; |
42 | 42 | ||
43 | #if WINDOWS | ||
44 | if ((strlen(pch) >= 3) && pch[1] == ':') | ||
45 | { | ||
46 | if (NULL != strstr(pch, "\\")) | ||
47 | { | ||
48 | pch = strtok(pch, "\\"); | ||
49 | while (pch != NULL) | ||
50 | { | ||
51 | pch = strtok(NULL, "\\"); | ||
52 | if (pch != NULL) | ||
53 | filename = pch; | ||
54 | } | ||
55 | } | ||
56 | } | ||
57 | if (filename != NULL) | ||
58 | pch = filename; /* If we miss the next condition, filename = pch will | ||
59 | * not harm us. | ||
60 | */ | ||
61 | #endif | ||
62 | if (NULL != strstr(pch, "/")) | 43 | if (NULL != strstr(pch, "/")) |
63 | { | 44 | { |
64 | pch = strtok(pch, "/"); | 45 | pch = strtok(pch, "/"); |