mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS by a simple check. (putc_unlocked): Removed check. Not used. (strsep, mkdtemp, asprintf): Replaced checks by gnulib checks. (xsize): Added will probably come handy soon. (CFLAGS): Use -Wformat-security instead of -Wformat-nonliteral. Add --Wno-format-y2k. * gl/, gl/m4/: New. * gpg-agent.c: Include setenv.h. * Makefile.am (AM_CPPFLAGS): Added. * util.h: Add some includes for gnulib. (ttyname, isascii): Define them inline. * fseeko.c, ftello.c: Removed. * strsep.c, mkdtemp.c: Removed. * ttyname.c, isascii.c: Removed. * mkdtemp.c: Removed. * exec.c: Include mkdtemp.h * keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement function. Copied from ../common/ftello.c. * keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement function. Copied from ../common/iobuf.c. * scdaemon.c: Include mkdtemp.h. * misc.c: Include setenv.h. * symcryptrun.c: Include mkdtemp.h.
This commit is contained in:
parent
6e522257a9
commit
cad9562436
34 changed files with 166 additions and 486 deletions
|
@ -1,3 +1,8 @@
|
|||
2005-06-01 Werner Koch <wk@g10code.com>
|
||||
|
||||
* mkdtemp.c: Removed.
|
||||
* exec.c: Include mkdtemp.h
|
||||
|
||||
2004-12-21 Werner Koch <wk@g10code.com>
|
||||
|
||||
* gpgv.c, g10.c (main): Use default_hoemdir ().
|
||||
|
|
|
@ -21,14 +21,14 @@
|
|||
|
||||
EXTRA_DIST = options.skel
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/intl
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
|
||||
include $(top_srcdir)/am/cmacros.am
|
||||
|
||||
AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
|
||||
|
||||
needed_libs = ../common/libcommon.a ../jnlib/libjnlib.a
|
||||
needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
|
||||
|
||||
bin_PROGRAMS = gpg2 gpgv2
|
||||
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include "i18n.h"
|
||||
#include "iobuf.h"
|
||||
#include "util.h"
|
||||
#include "mkdtemp.h"
|
||||
#include "exec.h"
|
||||
|
||||
#ifdef NO_EXEC
|
||||
|
@ -55,10 +56,6 @@ int set_exec_path(const char *path,int method) { return GPG_ERR_GENERAL; }
|
|||
|
||||
#else /* ! NO_EXEC */
|
||||
|
||||
#ifndef HAVE_MKDTEMP
|
||||
char *mkdtemp(char *template);
|
||||
#endif
|
||||
|
||||
#if defined (_WIN32)
|
||||
/* This is a nicer system() for windows that waits for programs to
|
||||
return before returning control to the caller. I hate helpful
|
||||
|
|
|
@ -1,98 +0,0 @@
|
|||
/* mkdtemp.c - libc replacement function
|
||||
* Copyright (C) 2001 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
* GnuPG is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GnuPG is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
/* This is a replacement function for mkdtemp in case the platform
|
||||
we're building on (like mine!) doesn't have it. */
|
||||
|
||||
#include <config.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include "types.h"
|
||||
#include "cipher.h"
|
||||
|
||||
#ifdef MKDIR_TAKES_ONE_ARG
|
||||
# undef mkdir
|
||||
# define mkdir(a,b) mkdir(a)
|
||||
#endif
|
||||
|
||||
char *mkdtemp(char *template)
|
||||
{
|
||||
unsigned int attempts,idx,count=0;
|
||||
byte *ch;
|
||||
|
||||
idx=strlen(template);
|
||||
|
||||
/* Walk backwards to count all the Xes */
|
||||
while(idx>0 && template[idx-1]=='X')
|
||||
{
|
||||
count++;
|
||||
idx--;
|
||||
}
|
||||
|
||||
if(count==0)
|
||||
{
|
||||
errno=EINVAL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ch=&template[idx];
|
||||
|
||||
/* Try 4 times to make the temp directory */
|
||||
for(attempts=0;attempts<4;attempts++)
|
||||
{
|
||||
unsigned int remaining=count;
|
||||
char *marker=ch;
|
||||
byte *randombits;
|
||||
|
||||
idx=0;
|
||||
|
||||
/* Using really random bits is probably overkill here. The
|
||||
worst thing that can happen with a directory name collision
|
||||
is that the function will return an error. */
|
||||
|
||||
randombits=get_random_bits(4*remaining,0,0);
|
||||
|
||||
while(remaining>1)
|
||||
{
|
||||
sprintf(marker,"%02X",randombits[idx++]);
|
||||
marker+=2;
|
||||
remaining-=2;
|
||||
}
|
||||
|
||||
/* Any leftover Xes? get_random_bits rounds up to full bytes,
|
||||
so this is safe. */
|
||||
if(remaining>0)
|
||||
sprintf(marker,"%X",randombits[idx]&0xF);
|
||||
|
||||
xfree (randombits);
|
||||
|
||||
if(mkdir(template,0700)==0)
|
||||
break;
|
||||
}
|
||||
|
||||
if(attempts==4)
|
||||
return NULL; /* keeps the errno from mkdir, whatever it is */
|
||||
|
||||
return template;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue