projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement a --sleep-time option
[privoxy.git]
/
amiga.c
diff --git
a/amiga.c
b/amiga.c
index
a9c2ce2
..
2bf43cc
100644
(file)
--- a/
amiga.c
+++ b/
amiga.c
@@
-1,4
+1,4
@@
-const char amiga_rcs[] = "$Id: amiga.c,v 1.
2 2001/05/23 00:13:58
joergs Exp $";
+const char amiga_rcs[] = "$Id: amiga.c,v 1.
12 2007/01/07 07:40:52
joergs Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/amiga.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/amiga.c,v $
@@
-6,7
+6,7
@@
const char amiga_rcs[] = "$Id: amiga.c,v 1.2 2001/05/23 00:13:58 joergs Exp $";
* Purpose : Amiga-specific declarations.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
* Purpose : Amiga-specific declarations.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- *
IJBSWA team. http://ijbswa.sourceforge.net
+ *
Privoxy team. http://www.privoxy.org/
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@
-26,17
+26,8
@@
const char amiga_rcs[] = "$Id: amiga.c,v 1.2 2001/05/23 00:13:58 joergs Exp $";
* or write to the Free Software Foundation, Inc., 59
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* or write to the Free Software Foundation, Inc., 59
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Revisions :
- * $Log: amiga.c,v $
- * Revision 1.2 2001/05/23 00:13:58 joergs
- * AmigaOS support fixed.
- *
- * Revision 1.1.1.1 2001/05/15 13:58:46 oes
- * Initial import of version 2.9.3 source tree
- *
- *
*********************************************************************/
*********************************************************************/
-
\f
+
#include "config.h"
#include "config.h"
@@
-49,58
+40,94
@@
const char amiga_rcs[] = "$Id: amiga.c,v 1.2 2001/05/23 00:13:58 joergs Exp $";
const char amiga_h_rcs[] = AMIGA_H_VERSION;
const char amiga_h_rcs[] = AMIGA_H_VERSION;
+static char *ver USED = "$VER: Privoxy " __AMIGAVERSION__ " (" __AMIGADATE__ ")";
+#ifdef __amigaos4__
+static char *stack USED = "$STACK: 524288";
+#else
unsigned long __stack = 100*1024;
unsigned long __stack = 100*1024;
-static char ver[] = "$VER: junkbuster " __AMIGAVERSION__ " (" __AMIGADATE__ ")";
+#endif
struct Task *main_task = NULL;
int childs = 0;
void serve(struct client_state *csp);
struct Task *main_task = NULL;
int childs = 0;
void serve(struct client_state *csp);
-
__saveds
ULONG server_thread(void)
+
SAVEDS
ULONG server_thread(void)
{
struct client_state *local_csp;
struct UserData UserData;
struct Task *me=FindTask(NULL);
{
struct client_state *local_csp;
struct UserData UserData;
struct Task *me=FindTask(NULL);
+#ifdef __amigaos4__
+ struct Library *SocketBase;
+#endif
Wait(SIGF_SINGLE);
local_csp=(struct client_state *)(me->tc_UserData);
me->tc_UserData=&UserData;
SocketBase=(APTR)OpenLibrary("bsdsocket.library",3);
Wait(SIGF_SINGLE);
local_csp=(struct client_state *)(me->tc_UserData);
me->tc_UserData=&UserData;
SocketBase=(APTR)OpenLibrary("bsdsocket.library",3);
- if(SocketBase)
+ if (SocketBase)
+#ifdef __amigaos4__
+ {
+ ISocket = (struct SocketIFace *)GetInterface(SocketBase, "main", 1, NULL);
+ }
+ if (ISocket)
+#endif
{
SetErrnoPtr(&(UserData.eno),sizeof(int));
local_csp->cfd=ObtainSocket(local_csp->cfd, AF_INET, SOCK_STREAM, 0);
{
SetErrnoPtr(&(UserData.eno),sizeof(int));
local_csp->cfd=ObtainSocket(local_csp->cfd, AF_INET, SOCK_STREAM, 0);
- if(
-1
!=local_csp->cfd)
+ if(
JB_INVALID_SOCKET
!=local_csp->cfd)
{
Signal(main_task,SIGF_SINGLE);
serve((struct client_state *) local_csp);
} else {
{
Signal(main_task,SIGF_SINGLE);
serve((struct client_state *) local_csp);
} else {
- local_csp->
active = 0
;
+ local_csp->
flags &= ~CSP_FLAG_ACTIVE
;
Signal(main_task,SIGF_SINGLE);
}
Signal(main_task,SIGF_SINGLE);
}
+#ifdef __amigaos4__
+ DropInterface((struct Interface *)ISocket);
+#endif
CloseLibrary(SocketBase);
} else {
CloseLibrary(SocketBase);
} else {
- local_csp->active = 0;
+#ifdef __amigaos4__
+ CloseLibrary(SocketBase);
+#endif
+ local_csp->flags &= ~CSP_FLAG_ACTIVE;
Signal(main_task,SIGF_SINGLE);
}
childs--;
return 0;
}
Signal(main_task,SIGF_SINGLE);
}
childs--;
return 0;
}
+static BPTR olddir;
+
void amiga_exit(void)
{
void amiga_exit(void)
{
- if(SocketBase)
+#ifdef __amigaos4__
+ if (ISocket)
+#else
+ if (SocketBase)
+#endif
{
{
+#ifdef __amigaos4__
+ struct Library *SocketBase = ISocket->Data.LibBase;
+ DropInterface((struct Interface *)ISocket);
+#endif
CloseLibrary(SocketBase);
}
CloseLibrary(SocketBase);
}
+ CurrentDir(olddir);
}
}
+#ifndef __amigaos4__
static struct SignalSemaphore memsem;
static struct SignalSemaphore *memsemptr = NULL;
static struct SignalSemaphore memsem;
static struct SignalSemaphore *memsemptr = NULL;
+#endif
static struct UserData GlobalUserData;
void InitAmiga(void)
{
static struct UserData GlobalUserData;
void InitAmiga(void)
{
+#ifdef __amigaos4__
+ struct Library *SocketBase;
+#endif
+
main_task = FindTask(NULL);
main_task->tc_UserData = &GlobalUserData;
main_task = FindTask(NULL);
main_task->tc_UserData = &GlobalUserData;
@@
-111,21
+138,36
@@
void InitAmiga(void)
signal(SIGINT,SIG_IGN);
SocketBase = (APTR)OpenLibrary("bsdsocket.library",3);
signal(SIGINT,SIG_IGN);
SocketBase = (APTR)OpenLibrary("bsdsocket.library",3);
+#ifdef __amigaos4__
+ if (SocketBase)
+ {
+ ISocket = (struct SocketIFace *)GetInterface(SocketBase, "main", 1, NULL);
+ }
+ if (!ISocket)
+#else
if (!SocketBase)
if (!SocketBase)
+#endif
{
{
+#ifdef __amigaos4__
+ CloseLibrary(SocketBase);
+#endif
fprintf(stderr, "Can't open bsdsocket.library V3+\n");
exit(RETURN_ERROR);
}
SetErrnoPtr(&(GlobalUserData.eno),sizeof(int));
fprintf(stderr, "Can't open bsdsocket.library V3+\n");
exit(RETURN_ERROR);
}
SetErrnoPtr(&(GlobalUserData.eno),sizeof(int));
+#ifndef __amigaos4__
InitSemaphore(&memsem);
memsemptr = &memsem;
InitSemaphore(&memsem);
memsemptr = &memsem;
+#endif
+ olddir=CurrentDir(GetProgramDir());
atexit(amiga_exit);
}
atexit(amiga_exit);
}
+#ifndef __amigaos4__
#ifdef __GNUC__
#ifdef libnix
#ifdef __GNUC__
#ifdef libnix
-/* multit
ask
ingsafe libnix replacements */
+/* multit
hread
ingsafe libnix replacements */
static void *memPool=NULL;
void *malloc (size_t s)
static void *memPool=NULL;
void *malloc (size_t s)
@@
-234,7
+276,8
@@
ADD2EXIT(__memCleanUp,-50);
#error No libnix and no ixemul!?
#endif /* libnix */
#else
#error No libnix and no ixemul!?
#endif /* libnix */
#else
-#error Only GCC is supported, multit
ask
ing safe malloc/free required.
+#error Only GCC is supported, multit
hread
ing safe malloc/free required.
#endif /* __GNUC__ */
#endif /* __GNUC__ */
+#endif /* !__amigaos4__ */
#endif /* def AMIGA */
#endif /* def AMIGA */