HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't GC unregister null thread
[bpt/guile.git]
/
libguile
/
simpos.c
diff --git
a/libguile/simpos.c
b/libguile/simpos.c
index
79b9f3e
..
84b8b9d
100644
(file)
--- a/
libguile/simpos.c
+++ b/
libguile/simpos.c
@@
-1,24
+1,25
@@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004 Free Software
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004
, 2009, 2010
Free Software
* Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- *
License as published by the Free Software Foundation; either
- *
version 2.1 of
the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public
License
+ *
as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
*
- * This library is distributed in the hope that it will be useful,
- *
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
\f
*/
\f
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
@@
-88,11
+89,6
@@
SCM_DEFINE (scm_system, "system", 0, 1, 0,
#ifdef HAVE_SYSTEM
#ifdef HAVE_WAITPID
#ifdef HAVE_SYSTEM
#ifdef HAVE_WAITPID
-static void
-free_string_pointers (void *data)
-{
- scm_i_free_string_pointers ((char **)data);
-}
SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
(SCM args),
SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
(SCM args),
@@
-127,15
+123,11
@@
SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
int pid;
char **execargv;
int pid;
char **execargv;
- scm_dynwind_begin (0);
-
/* allocate before fork */
execargv = scm_i_allocate_string_pointers (args);
/* allocate before fork */
execargv = scm_i_allocate_string_pointers (args);
- scm_dynwind_unwind_handler (free_string_pointers, execargv,
- SCM_F_WIND_EXPLICITLY);
/* make sure the child can't kill us (as per normal system call) */
/* make sure the child can't kill us (as per normal system call) */
- sig_ign = scm_from_long ((unsigned long) SIG_IGN);
+ sig_ign = scm_from_
u
long ((unsigned long) SIG_IGN);
sigint = scm_from_int (SIGINT);
sigquit = scm_from_int (SIGQUIT);
oldint = scm_sigaction (sigint, sig_ign, SCM_UNDEFINED);
sigint = scm_from_int (SIGINT);
sigquit = scm_from_int (SIGQUIT);
oldint = scm_sigaction (sigint, sig_ign, SCM_UNDEFINED);
@@
-148,7
+140,6
@@
SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
execvp (execargv[0], execargv);
SCM_SYSERROR;
/* not reached. */
execvp (execargv[0], execargv);
SCM_SYSERROR;
/* not reached. */
- scm_dynwind_end ();
return SCM_BOOL_F;
}
else
return SCM_BOOL_F;
}
else
@@
-165,7
+156,6
@@
SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit));
scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit));
- scm_dynwind_end ();
return scm_from_int (status);
}
}
return scm_from_int (status);
}
}