Wed, 21 Sep 2011 14:04:16 +0200
Introduce severe but necessary corrections and update to new vendor version.
michael@377 | 1 | Index: main.c |
michael@377 | 2 | diff -Nau main.c.orig main.c |
michael@377 | 3 | --- main.c.orig 2008-06-17 05:19:48 +0200 |
michael@377 | 4 | +++ main.c 2008-08-09 11:58:55 +0200 |
michael@377 | 5 | @@ -86,7 +86,11 @@ |
michael@377 | 6 | bindhost = NULL; |
michael@377 | 7 | |
michael@377 | 8 | if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0) |
michael@377 | 9 | +#if defined(__sun__) |
michael@377 | 10 | + errx(1, "setbindhost"); |
michael@377 | 11 | +#else |
michael@377 | 12 | errx(1, "setbindhost: %s", gai_strerror(n)); |
michael@377 | 13 | +#endif |
michael@377 | 14 | } |
michael@377 | 15 | |
michael@377 | 16 | static void |
michael@377 | 17 | Index: rtpp_command.c |
michael@377 | 18 | diff -Nau rtpp_command.c.orig rtpp_command.c |
michael@377 | 19 | --- rtpp_command.c.orig 2009-03-25 02:53:17.397562078 +0100 |
michael@377 | 20 | +++ rtpp_command.c 2009-03-25 02:52:59.126654989 +0100 |
michael@377 | 21 | @@ -72,6 +72,36 @@ |
michael@377 | 22 | static void handle_query(struct cfg *, int, struct sockaddr_storage *, |
michael@377 | 23 | socklen_t, char *, struct rtpp_session *, int); |
michael@377 | 24 | |
michael@377 | 25 | +#if defined(__sun__) |
michael@377 | 26 | +static char |
michael@377 | 27 | +*strsep(char **stringp, const char *delim) |
michael@377 | 28 | +{ |
michael@377 | 29 | + char *s; |
michael@377 | 30 | + const char *spanp; |
michael@377 | 31 | + int c, sc; |
michael@377 | 32 | + char *tok; |
michael@377 | 33 | + |
michael@377 | 34 | + if ((s = *stringp) == NULL) |
michael@377 | 35 | + return NULL; |
michael@377 | 36 | + for (tok = s;;) { |
michael@377 | 37 | + c = *s++; |
michael@377 | 38 | + spanp = delim; |
michael@377 | 39 | + do { |
michael@377 | 40 | + if ((sc = *spanp++) == c) { |
michael@377 | 41 | + if (c == 0) |
michael@377 | 42 | + s = NULL; |
michael@377 | 43 | + else |
michael@377 | 44 | + s[-1] = 0; |
michael@377 | 45 | + *stringp = s; |
michael@377 | 46 | + return tok; |
michael@377 | 47 | + } |
michael@377 | 48 | + } while (sc != 0); |
michael@377 | 49 | + } |
michael@377 | 50 | + /* NOTREACHED */ |
michael@377 | 51 | + return NULL; |
michael@377 | 52 | +} |
michael@377 | 53 | + |
michael@377 | 54 | +#endif |
michael@377 | 55 | static int |
michael@377 | 56 | create_twinlistener(struct cfg *cf, struct sockaddr *ia, int port, int *fds) |
michael@377 | 57 | { |