1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Fixed a typo and W32 support for the latest CVS changes.

This commit is contained in:
Timo Schulz 2001-12-23 12:40:04 +00:00
parent eab333733c
commit 8c35c19e43
9 changed files with 32 additions and 2 deletions

View File

@ -1,3 +1,15 @@
2001-12-23 Timo Schulz <ts@winpt.org>
* misc.c (check_permissions): Do not use it for W32 systems.
* tdbio.c (migrate_from_v2): Define ftruncate as chsize() for W32.
* mkdtemp.c: W32 support.
* photoid.c: Ditto.
* exec.c: Ditto.
2001-12-22 David Shaw <dshaw@jabberwocky.com> 2001-12-22 David Shaw <dshaw@jabberwocky.com>
* exec.c (make_tempdir): avoid compiler warning with const * exec.c (make_tempdir): avoid compiler warning with const

View File

@ -24,7 +24,9 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef HAVE_DOSISH_SYSTEM
#include <sys/wait.h> #include <sys/wait.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
@ -380,7 +382,9 @@ int exec_read(struct exec_info *info)
goto fail; goto fail;
} }
#ifndef HAVE_DOSISH_SYSTEM
info->progreturn=WEXITSTATUS(info->progreturn); info->progreturn=WEXITSTATUS(info->progreturn);
#endif
if(info->progreturn==127) if(info->progreturn==127)
{ {

View File

@ -26,7 +26,9 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef HAVE_DOSISH_SYSTEM
#include <sys/wait.h> #include <sys/wait.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "keyserver-internal.h" #include "keyserver-internal.h"

View File

@ -341,6 +341,7 @@ openpgp_md_test_algo( int algo )
int int
check_permissions(const char *path,int checkonly) check_permissions(const char *path,int checkonly)
{ {
#ifndef HAVE_DOSISH_SYSTEM
#ifdef HAVE_STAT #ifdef HAVE_STAT
struct stat statbuf; struct stat statbuf;
int isdir=0; int isdir=0;
@ -392,6 +393,7 @@ check_permissions(const char *path,int checkonly)
return 1; return 1;
} }
#endif #endif
#endif /*!HAVE_DOSISH_SYSTEM*/
return 0; return 0;
} }

View File

@ -11,6 +11,11 @@
#include "types.h" #include "types.h"
#include "cipher.h" #include "cipher.h"
#ifdef MKDIR_TAKES_ONE_ARG
# undef mkdir
# define mkdir(a,b) mkdir(a)
#endif
char *mkdtemp(char *template) char *mkdtemp(char *template)
{ {
int attempts,idx,count=0; int attempts,idx,count=0;

View File

@ -24,7 +24,9 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef HAVE_DOSISH_SYSTEM
#include <sys/wait.h> #include <sys/wait.h>
#endif
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include "keydb.h" #include "keydb.h"

View File

@ -39,6 +39,9 @@
#include "trustdb.h" #include "trustdb.h"
#include "tdbio.h" #include "tdbio.h"
#ifdef HAVE_DOSISH_SYSTEM
#define ftruncate chsize
#endif
/**************** /****************
* Yes, this is a very simple implementation. We should really * Yes, this is a very simple implementation. We should really

View File

@ -21,7 +21,7 @@
#define G10_UTIL_H #define G10_UTIL_H
#if defined (__MINGW32__) || defined (__CYGWIN32__) #if defined (__MINGW32__) || defined (__CYGWIN32__)
# include <stdarg.> # include <stdarg.h>
#endif #endif
#include "types.h" #include "types.h"

View File

@ -27,7 +27,7 @@
#include <config.h> #include <config.h>
#ifdef USE_SIMPLE_GETTEXT #ifdef USE_SIMPLE_GETTEXT
#if defined (__MINGW32__) || defined (__CYGWIN32__) #if !defined (__MINGW32__) && !defined (__CYGWIN32__)
#error This file can only be used with MingW32 or Cygwin32 #error This file can only be used with MingW32 or Cygwin32
#endif #endif