security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

tidied up RISC OS specific stuff

Browse Source
This commit is contained in:
Stefan Bellon 2002-06-21 09:59:39 +00:00
parent f3c436014b
commit 53a953568e
9 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2002-06-21 Stefan Bellon <sbellon@sbellon.de>
* g10.c [__riscos__]: Moved RISC OS specific stuff to util/riscos.c
and include/util.h.
* gpgv.c [__riscos__]: Likewise.
2002-06-20 David Shaw <dshaw@jabberwocky.com>
* keydb.h, pkclist.c (select_algo_from_prefs): Allow passing a

12
g10/g10.c
View File

@ -28,10 +28,6 @@
#ifdef HAVE_DOSISH_SYSTEM
#include <fcntl.h> /* for setmode() */
#endif
#ifdef __riscos__
#include <unixlib/local.h>
#include <unixlib/features.h>
#endif /* __riscos__ */
#define INCLUDED_BY_MAIN_MODULE 1
#include "packet.h"
@ -600,8 +596,7 @@ static void add_notation_data( const char *string, int which );
static void add_policy_url( const char *string, int which );
#ifdef __riscos__
/* This enables better dynamic memory management on RISC OS */
const char *__dynamic_da_name = "GnuPG Heap";
RISCOS_GLOBAL_STATICS("GnuPG Heap")
#endif /* __riscos__ */
const char *
@ -872,10 +867,9 @@ main( int argc, char **argv )
#ifdef USE_SHM_COPROCESSING
ulong requested_shm_size=0;
#endif
#ifdef __riscos__
/* set global RISC OS specific properties */
__riscosify_control = __RISCOSIFY_NO_PROCESS;
__feature_imagefs_is_file = 1;
riscos_global_defaults();
opt.lock_once = 1;
#endif /* __riscos__ */

11
g10/gpgv.c
View File

@ -28,10 +28,6 @@
#ifdef HAVE_DOSISH_SYSTEM
#include <fcntl.h> /* for setmode() */
#endif
#ifdef __riscos__
#include <unixlib/local.h>
#include <unixlib/features.h>
#endif /* __riscos__ */
#define INCLUDED_BY_MAIN_MODULE 1
#include "packet.h"
@ -83,8 +79,7 @@ static ARGPARSE_OPTS opts[] = {
int g10_errors_seen = 0;
#ifdef __riscos__
/* This enables better dynamic memory management on RISC OS */
const char *__dynamic_da_name = "GnuPG (gpgv) Heap";
RISCOS_GLOBAL_STATICS("GnuPG (gpgv) Heap")
#endif /* __riscos__ */
const char *
@ -144,9 +139,9 @@ main( int argc, char **argv )
STRLIST sl;
STRLIST nrings=NULL;
unsigned configlineno;
#ifdef __riscos__
__riscosify_control = __RISCOSIFY_NO_PROCESS;
__feature_imagefs_is_file = 1;
riscos_global_defaults();
#endif /* __riscos__ */
log_set_name("gpgv");

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-21 Stefan Bellon <sbellon@sbellon.de>
* util.h [__riscos__]: Further moving away of RISC OS specific
stuff from general code.
2002-06-20 Stefan Bellon <sbellon@sbellon.de>
* util.h [__riscos__]: Added riscos_set_filetype().

6
include/util.h
View File

@ -260,6 +260,12 @@ int vasprintf ( char **result, const char *format, va_list args);
#ifdef __riscos__
/* needed for strcasecmp() */
#include <strings.h>
/* needed for filename munging */
#include <unixlib/local.h>
/* needed for image file system feature */
#include <unixlib/features.h>
void riscos_global_defaults();
#define RISCOS_GLOBAL_STATICS(a) const char *__dynamic_da_name = (a);
void riscos_set_filetype(const char *filename, const char *mimetype);
pid_t riscos_getpid(void);
int riscos_kill(pid_t pid, int sig);

5
scripts/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-21 Stefan Bellon <sbellon@sbellon.de>
* conf-riscos/Makefile: Changes due to moving around RISC OS
specific stuff in the code.
2002-06-07 Stefan Bellon <sbellon@sbellon.de>
* conf-riscos/include/config.h [__riscos__]: Fixed macro bug.

8
scripts/conf-riscos/Makefile
View File

@ -181,7 +181,7 @@ GPGV_OBJS=g10.o.armor \
cipher.o.rsa \
mpi.mpi \
zlib.zlib
GPGKEYS_OBJS=keyserver.o.gpgkeys_ldap \
GPGKEYS_OBJS=util.o.riscos \
util.o.strgutil \
util.o.memory \
util.o.logger \
@ -220,8 +220,8 @@ tools.gpgsplit: tools.o.gpgsplit util.util intl.gettext zlib.zlib
-squeeze tools.gpgsplit
-copy tools.gpgsplit ADFS::A5.$.tmp.!GnuPG.gpgsplit ~CF~V
keyserver.gpgkeys_ldap: $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap
$(LINK) $(LD_FLAGS) $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap -o keyserver.gpgkeys_ldap
keyserver.gpgkeys_ldap: keyserver.o.gpgkeys_ldap $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap
$(LINK) $(LD_FLAGS) keyserver.o.gpgkeys_ldap $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap -o keyserver.gpgkeys_ldap
-squeeze keyserver.gpgkeys_ldap
-copy keyserver.gpgkeys_ldap ADFS::A5.$.tmp.!GnuPG.gpgkeys_ldap ~CF~V
@ -375,7 +375,7 @@ clean-g10:
-ifthere g10.o.* then wipe g10.o.* ~CFR~V
clean-keyserver:
-ifthere keyserver.gpgkeys_ldap then wipe keyserver.gpgkeys_ldap ~CFR~V
-ifthere keyserver.gpgkeys_* then wipe keyserver.gpgkeys_* ~CFR~V
-ifthere keyserver.o.* then wipe keyserver.o.* ~CFR~V
clean-tools:

4
util/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-21 Stefan Bellon <sbellon@sbellon.de>
* riscos.c (riscos_global_defaults): New.
2002-06-20 Stefan Bellon <sbellon@sbellon.de>
* riscos.c (riscos_set_filetype_by_number, riscos_set_filetype):

7
util/riscos.c
View File

@ -95,6 +95,13 @@ riscos_set_filetype_by_number(const char *filename, int type)
/* exported RISC OS functions */
void
riscos_global_defaults()
{
__riscosify_control = __RISCOSIFY_NO_PROCESS;
__feature_imagefs_is_file = 1;
}
void
riscos_set_filetype(const char *filename, const char *mimetype)
{