projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31486ed
)
Added AmigaOS4 support and made it work on AmigaOS 3.x with current sources.
author
joergs
<joergs@users.sourceforge.net>
Sun, 7 Jan 2007 07:40:52 +0000
(07:40 +0000)
committer
joergs
<joergs@users.sourceforge.net>
Sun, 7 Jan 2007 07:40:52 +0000
(07:40 +0000)
amiga.c
patch
|
blob
|
history
amiga.h
patch
|
blob
|
history
diff --git
a/amiga.c
b/amiga.c
index
ccd021e
..
744bffd
100644
(file)
--- a/
amiga.c
+++ b/
amiga.c
@@
-1,7
+1,7
@@
-const char amiga_rcs[] = "$Id: amiga.c,v 1.
9 2002/03/26 22:29:54 swa
Exp $";
+const char amiga_rcs[] = "$Id: amiga.c,v 1.
11 2006/07/18 14:48:45 david__schmidt
Exp $";
/*********************************************************************
*
/*********************************************************************
*
- * File : $Source: /cvsroot/ijbswa/current/
Attic/
amiga.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/amiga.c,v $
*
* Purpose : Amiga-specific declarations.
*
*
* Purpose : Amiga-specific declarations.
*
@@
-28,6
+28,10
@@
const char amiga_rcs[] = "$Id: amiga.c,v 1.9 2002/03/26 22:29:54 swa Exp $";
*
* Revisions :
* $Log: amiga.c,v $
*
* Revisions :
* $Log: amiga.c,v $
+ * Revision 1.11 2006/07/18 14:48:45 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
* Revision 1.9 2002/03/26 22:29:54 swa
* we have a new homepage!
*
* Revision 1.9 2002/03/26 22:29:54 swa
* we have a new homepage!
*
@@
-91,24
+95,37
@@
const char amiga_rcs[] = "$Id: amiga.c,v 1.9 2002/03/26 22:29:54 swa 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: Privoxy " __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);
@@
-120,8
+137,14
@@
__saveds ULONG server_thread(void)
local_csp->flags &= ~CSP_FLAG_ACTIVE;
Signal(main_task,SIGF_SINGLE);
}
local_csp->flags &= ~CSP_FLAG_ACTIVE;
Signal(main_task,SIGF_SINGLE);
}
+#ifdef __amigaos4__
+ DropInterface((struct Interface *)ISocket);
+#endif
CloseLibrary(SocketBase);
} else {
CloseLibrary(SocketBase);
} else {
+#ifdef __amigaos4__
+ CloseLibrary(SocketBase);
+#endif
local_csp->flags &= ~CSP_FLAG_ACTIVE;
Signal(main_task,SIGF_SINGLE);
}
local_csp->flags &= ~CSP_FLAG_ACTIVE;
Signal(main_task,SIGF_SINGLE);
}
@@
-133,19
+156,33
@@
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);
}
CurrentDir(olddir);
}
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;
@@
-156,19
+193,33
@@
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);
}
olddir=CurrentDir(GetProgramDir());
atexit(amiga_exit);
}
+#ifndef __amigaos4__
#ifdef __GNUC__
#ifdef libnix
/* multithreadingsafe libnix replacements */
#ifdef __GNUC__
#ifdef libnix
/* multithreadingsafe libnix replacements */
@@
-282,5
+333,6
@@
ADD2EXIT(__memCleanUp,-50);
#else
#error Only GCC is supported, multithreading safe malloc/free required.
#endif /* __GNUC__ */
#else
#error Only GCC is supported, multithreading safe malloc/free required.
#endif /* __GNUC__ */
+#endif /* !__amigaos4__ */
#endif /* def AMIGA */
#endif /* def AMIGA */
diff --git
a/amiga.h
b/amiga.h
index
4d13690
..
a127776
100644
(file)
--- a/
amiga.h
+++ b/
amiga.h
@@
-1,10
+1,10
@@
#ifdef AMIGA
#ifndef AMIGA_H_INCLUDED
#define AMIGA_H_INCLUDED
#ifdef AMIGA
#ifndef AMIGA_H_INCLUDED
#define AMIGA_H_INCLUDED
-#define AMIGA_H_VERSION "$Id: amiga.h,v 1.
9 2002/03/26 22:29:54 swa
Exp $"
+#define AMIGA_H_VERSION "$Id: amiga.h,v 1.
11 2006/07/18 14:48:45 david__schmidt
Exp $"
/*********************************************************************
*
/*********************************************************************
*
- * File : $Source: /cvsroot/ijbswa/current/
Attic/
amiga.h,v $
+ * File : $Source: /cvsroot/ijbswa/current/amiga.h,v $
*
* Purpose : Amiga-specific declarations.
*
*
* Purpose : Amiga-specific declarations.
*
@@
-31,6
+31,10
@@
*
* Revisions :
* $Log: amiga.h,v $
*
* Revisions :
* $Log: amiga.h,v $
+ * Revision 1.11 2006/07/18 14:48:45 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
* Revision 1.9 2002/03/26 22:29:54 swa
* we have a new homepage!
*
* Revision 1.9 2002/03/26 22:29:54 swa
* we have a new homepage!
*
@@
-69,11
+73,12
@@
#undef _KERNEL
#define __NOLIBBASE__
#undef _KERNEL
#define __NOLIBBASE__
+#define __NOGLOBALIFACE__
#include <proto/socket.h>
#undef __NOLIBBASE__
#include <proto/socket.h>
#undef __NOLIBBASE__
+#undef __NOGLOBALIFACE__
#define __CONSTLIBBASEDECL__ const
#define __CONSTLIBBASEDECL__ const
-#define DEVICES_TIMER_H
#include <proto/exec.h>
#include <exec/tasks.h>
#include <proto/dos.h>
#include <proto/exec.h>
#include <exec/tasks.h>
#include <proto/dos.h>
@@
-81,11
+86,20
@@
struct UserData
{
struct UserData
{
+#ifdef __amigaos4__
+ struct SocketIFace *si;
+#else
struct Library *sb;
struct Library *sb;
+#endif
int eno;
};
int eno;
};
+#ifdef __amigaos4__
+#define ISocket (((struct UserData *)(FindTask(NULL)->tc_UserData))->si)
+#undef errno
+#else
#define SocketBase ((struct Library *)(((struct UserData *)(FindTask(NULL)->tc_UserData))->sb))
#define SocketBase ((struct Library *)(((struct UserData *)(FindTask(NULL)->tc_UserData))->sb))
+#endif
#define errno (((struct UserData *)(FindTask(NULL)->tc_UserData))->eno)
#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,NULL)
#define inet_ntoa(x) Inet_NtoA(x.s_addr)
#define errno (((struct UserData *)(FindTask(NULL)->tc_UserData))->eno)
#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,NULL)
#define inet_ntoa(x) Inet_NtoA(x.s_addr)
@@
-96,8
+110,35
@@
extern struct Task *main_task;
void InitAmiga(void);
void amiga_exit(void);
void __memCleanUp(void);
void InitAmiga(void);
void amiga_exit(void);
void __memCleanUp(void);
-
__saveds
ULONG server_thread(void);
+
SAVEDS
ULONG server_thread(void);
+#ifdef __amigaos4__
+#define exit(x) \
+{ \
+ if(main_task) \
+ { \
+ if(main_task == FindTask(NULL)) \
+ { \
+ while(childs) Delay(10*TICKS_PER_SECOND); exit(x); \
+ } \
+ else \
+ { \
+ if (ISocket) \
+ { \
+ struct Library *sb = ISocket->Data.LibBase; \
+ DropInterface((struct Interface *)ISocket); \
+ CloseLibrary(sb); \
+ } \
+ childs--; \
+ RemTask(NULL); \
+ } \
+ } \
+ else \
+ { \
+ exit(x); \
+ } \
+}
+#else
#define exit(x) \
{ \
if(main_task) \
#define exit(x) \
{ \
if(main_task) \
@@
-119,6
+160,12
@@
__saveds ULONG server_thread(void);
} \
}
} \
}
+#undef HAVE_RANDOM
+#define h_errno 0
+#define HAVE_TIMEGM
+#define timegm(tm) mktime(tm)
+#endif /* __amigaos4__ */
+
#undef EINTR
#define EINTR 0
#undef EINTR
#define EINTR 0