diff options
Diffstat (limited to 'gpgscm/ffi.c')
| -rw-r--r-- | gpgscm/ffi.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/gpgscm/ffi.c b/gpgscm/ffi.c index 5c8ff45..51de63f 100644 --- a/gpgscm/ffi.c +++ b/gpgscm/ffi.c @@ -24,7 +24,6 @@ #include <dirent.h> #include <errno.h> #include <fcntl.h> -#include <gpg-error.h> #include <limits.h> #include <stdarg.h> #include <stdlib.h> @@ -40,9 +39,9 @@ #include <readline/history.h> #endif -#include "../../common/util.h" -#include "../../common/exechelp.h" -#include "../../common/sysutils.h" +/* #include "../../common/util.h" */ +/* #include "../../common/exechelp.h" */ +/* #include "../../common/sysutils.h" */ #include "private.h" #include "ffi.h" @@ -236,7 +235,7 @@ do_getenv (scheme *sc, pointer args) char *value; FFI_ARG_OR_RETURN (sc, char *, name, string, args); FFI_ARGS_DONE_OR_RETURN (sc, args); - value = getenv (name); + value = gpgrt_getenv (name); FFI_RETURN_STRING (sc, value ? value : ""); } @@ -251,7 +250,7 @@ do_setenv (scheme *sc, pointer args) FFI_ARG_OR_RETURN (sc, char *, value, string, args); FFI_ARG_OR_RETURN (sc, int, overwrite, bool, args); FFI_ARGS_DONE_OR_RETURN (sc, args); - if (gnupg_setenv (name, value, overwrite)) + if (gpgrt_setenv (name, value, overwrite)) FFI_RETURN_ERR (sc, gpg_error_from_syserror ()); FFI_RETURN (sc); } @@ -376,7 +375,7 @@ do_mkdtemp (scheme *sc, pointer args) FFI_RETURN_ERR (sc, EINVAL); strncpy (buffer, template, sizeof buffer); - name = gnupg_mkdtemp (buffer); + name = NULL; /*gnupg_mkdtemp (buffer);*/ if (name == NULL) FFI_RETURN_ERR (sc, gpg_error_from_syserror ()); FFI_RETURN_STRING (sc, name); @@ -420,8 +419,8 @@ unlink_recursively (const char *name) || strcmp (dent->d_name, "..") == 0) continue; - child = xtryasprintf ("%s/%s", name, dent->d_name); - if (child == NULL) + child = gpgrt_bsprintf ("%s/%s", name, dent->d_name); + if (!child) { err = gpg_error_from_syserror (); goto leave; @@ -479,7 +478,7 @@ do_getcwd (scheme *sc, pointer args) pointer result; char *cwd; FFI_ARGS_DONE_OR_RETURN (sc, args); - cwd = gnupg_getcwd (); + cwd = gpgrt_getcwd (); if (cwd == NULL) FFI_RETURN_ERR (sc, gpg_error_from_syserror ()); result = sc->vptr->mk_string (sc, cwd); @@ -496,7 +495,7 @@ do_mkdir (scheme *sc, pointer args) FFI_ARG_OR_RETURN (sc, char *, name, string, args); FFI_ARG_OR_RETURN (sc, char *, mode, string, args); FFI_ARGS_DONE_OR_RETURN (sc, args); - if (gnupg_mkdir (name, mode) == -1) + if (gpgrt_mkdir (name, mode) == -1) FFI_RETURN_ERR (sc, gpg_error_from_syserror ()); FFI_RETURN (sc); } @@ -517,9 +516,10 @@ static pointer do_get_isotime (scheme *sc, pointer args) { FFI_PROLOG (); - gnupg_isotime_t timebuf; + /* gnupg_isotime_t timebuf; */ + char timebuf[15]; FFI_ARGS_DONE_OR_RETURN (sc, args); - gnupg_get_isotime (timebuf); + *timebuf = 0; /*gnupg_get_isotime (timebuf);*/ FFI_RETURN_STRING (sc, timebuf); } @@ -527,8 +527,12 @@ static pointer do_get_time (scheme *sc, pointer args) { FFI_PROLOG (); + time_t current; FFI_ARGS_DONE_OR_RETURN (sc, args); - FFI_RETURN_INT (sc, gnupg_get_time ()); + current = time (NULL); + if (current == (time_t)(-1)) + gpgrt_log_fatal ("time() failed\n"); + FFI_RETURN_INT (sc, current); } static pointer |