diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2006-03-24 22:54:41 +0000 | 
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2006-03-24 22:54:41 +0000 | 
| commit | c7abe91f8b134cbd73658e10993d1dffb44d942d (patch) | |
| tree | 98d45116802a5f50bc3e4640fcd0b32499f95c9e /mixguile | |
| parent | 3010d483748f058024c623fdfea689429e87bf5c (diff) | |
| download | mdk-c7abe91f8b134cbd73658e10993d1dffb44d942d.tar.gz mdk-c7abe91f8b134cbd73658e10993d1dffb44d942d.tar.bz2 | |
CVS $Id$ tags removed.
git-archimport-id: mdk@sv.gnu.org/mdk--devel--1--patch-7
Diffstat (limited to 'mixguile')
| -rw-r--r-- | mixguile/Makefile.am | 12 | ||||
| -rw-r--r-- | mixguile/mixguile-commands.scm | 12 | ||||
| -rw-r--r-- | mixguile/mixguile-vm-stat.scm | 16 | ||||
| -rw-r--r-- | mixguile/mixguile.c | 14 | ||||
| -rw-r--r-- | mixguile/mixguile.h | 14 | ||||
| -rw-r--r-- | mixguile/mixguile_main.c | 24 | ||||
| -rw-r--r-- | mixguile/xmixguile_cmd_dispatcher.c | 4 | 
7 files changed, 41 insertions, 55 deletions
| diff --git a/mixguile/Makefile.am b/mixguile/Makefile.am index cdafcba..4da99e4 100644 --- a/mixguile/Makefile.am +++ b/mixguile/Makefile.am @@ -1,17 +1,15 @@  ## Process this file with automake to produce Makefile.in -# Copyright (C) 2001 Free Software Foundation, Inc.  -#   +# Copyright (C) 2001 Free Software Foundation, Inc. +#  # This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without  +# unlimited permission to copy and/or distribute it, with or without  # modifications, as long as this notice is preserved. -#  +#  # This program is distributed in the hope that it will be useful, but  # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# $Id: Makefile.am,v 1.6 2001/09/30 20:29:30 jao Exp $ -  SCM_FILES = mixguile.scm mixguile-commands.scm mixguile-vm-stat.scm  EXTRA_DIST = $(SCM_FILES) @@ -34,7 +32,7 @@ bin_PROGRAMS = mixguile  mixguile_LDADD = $(top_builddir)/mixlib/libmix.a \                   $(top_builddir)/lib/libreplace.a \                   $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS) -mixguile_SOURCES = mixguile_main.c  +mixguile_SOURCES = mixguile_main.c  else diff --git a/mixguile/mixguile-commands.scm b/mixguile/mixguile-commands.scm index bc1aeb2..96bd3a0 100644 --- a/mixguile/mixguile-commands.scm +++ b/mixguile/mixguile-commands.scm @@ -1,24 +1,22 @@  ;; -*-scheme-*- -------------- mixguile-commands.scm :  ;  mixvm commands implementation using the mixvm-cmd primitive  ;  ------------------------------------------------------------------ -;   $Id: mixguile-commands.scm,v 1.5 2005/09/20 19:43:14 jao Exp $ -;  ------------------------------------------------------------------ -;  Copyright (C) 2001 Free Software Foundation, Inc. -;    +;  Copyright (C) 2001, 2006 Free Software Foundation, Inc. +;  ;  This program 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. -;    +;  ;  This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;    +;  ;;  ;; auxiliar functions for argument conversion diff --git a/mixguile/mixguile-vm-stat.scm b/mixguile/mixguile-vm-stat.scm index 1887b4c..60f25a5 100644 --- a/mixguile/mixguile-vm-stat.scm +++ b/mixguile/mixguile-vm-stat.scm @@ -1,24 +1,22 @@  ;; -*-scheme-*- -------------- mixguile-vm-stat.scm :  ;  mixvm status functions  ;  ------------------------------------------------------------------ -;   $Id: mixguile-vm-stat.scm,v 1.4 2005/09/20 19:43:14 jao Exp $ -;  ------------------------------------------------------------------ -;  Copyright (C) 2001 Free Software Foundation, Inc. -;    +;  Copyright (C) 2001, 2006 Free Software Foundation, Inc. +;  ;  This program 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. -;    +;  ;  This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;    +;  ;;  ;; possible status index @@ -57,7 +55,7 @@    (lambda (hook)      (mix-add-post-hook 'run hook)      (mix-add-post-hook 'next hook))) -     +  (define mix-add-break-hook    (lambda (hook) @@ -68,4 +66,4 @@      (mix-add-run-next-hook (mix-make-conditional-hook  			    mix-vm-cond-break? hook)))) -	 + diff --git a/mixguile/mixguile.c b/mixguile/mixguile.c index f37424f..104baea 100644 --- a/mixguile/mixguile.c +++ b/mixguile/mixguile.c @@ -1,24 +1,22 @@  /* -*-c-*- -------------- mixguile.c :   * Implementation of the functions declared in mixguile.h   * ------------------------------------------------------------------ - *  $Id: mixguile.c,v 1.8 2005/09/20 19:43:14 jao Exp $ - * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. - *   + * Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. + *   * This program 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. - *   + *   * This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - *   + *   */  #include <unistd.h> @@ -68,7 +66,7 @@ mixguile_load_bootstrap (gboolean loadlocal)    gchar *lscmfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,  				 MIX_CONFIG_DIR, G_DIR_SEPARATOR_S,  				 LOCAL_SCM_FILE, NULL); -   +    if (access (scmfile, R_OK) && access ((scmfile = LOCAL_SCM_FILE), R_OK))      {        g_warning (_("mixguile bootstrap file %s not found\n"), SCM_FILE); diff --git a/mixguile/mixguile.h b/mixguile/mixguile.h index c2ef492..aacb26e 100644 --- a/mixguile/mixguile.h +++ b/mixguile/mixguile.h @@ -1,24 +1,22 @@  /* -*-c-*- ---------------- mixguile.h :   * Interface to the mixguile interpreter.   * ------------------------------------------------------------------ - *  $Id: mixguile.h,v 1.6 2005/09/20 19:43:14 jao Exp $ - * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. - *   + * Copyright (C) 2001, 2006 Free Software Foundation, Inc. + *   * This program 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. - *   + *   * This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - *   + *   */ @@ -27,7 +25,7 @@  #include <mixlib/mix.h>  #include <mixlib/mix_vm_command.h> -#include <guile/gh.h>  +#include <guile/gh.h>  /* the main function type */  typedef void (*main_func_t) (int argc, char *argv[]); diff --git a/mixguile/mixguile_main.c b/mixguile/mixguile_main.c index 22e65be..faee06a 100644 --- a/mixguile/mixguile_main.c +++ b/mixguile/mixguile_main.c @@ -1,24 +1,22 @@  /* -*-c-*- -------------- mixguile_main.c :   * Main function for mixguile, the MIX Guile shell   * ------------------------------------------------------------------ - *  $Id: mixguile_main.c,v 1.6 2005/09/20 19:43:14 jao Exp $ - * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. - *   + * Copyright (C) 2001, 2006 Free Software Foundation, Inc. + *   * This program 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. - *   + *   * This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - *   + *   */  #include <stdlib.h> @@ -37,7 +35,7 @@ enum {    NOINIT_OPT = 'q',  }; -static const char *options_ = "vq";  +static const char *options_ = "vq";  static struct option long_options_[] =  { @@ -54,7 +52,7 @@ main (int argc, char *argv[])    int c;    gboolean initfile = TRUE; -       +    setlocale (LC_ALL, "");    bindtextdomain (PACKAGE, LOCALEDIR);    textdomain (PACKAGE); @@ -65,15 +63,15 @@ main (int argc, char *argv[])    while (1)      {        c = getopt_long (argc, argv, options_, long_options_, (int*)0); -      +        /* Detect the end of the options. */        if (c == -1)  	break; -      +        switch (c)  	{       	case VER_OPT: -	  mix_print_license ("mixguile, Scheme MIX Virtual Machine");  +	  mix_print_license ("mixguile, Scheme MIX Virtual Machine");  	  return EXIT_SUCCESS;  	case NOINIT_OPT:  	  initfile = FALSE; @@ -83,7 +81,7 @@ main (int argc, char *argv[])  	  break;  	}      } -   +    mix_init_lib ();    config = mix_config_new (NULL, CONFIG_FILE); diff --git a/mixguile/xmixguile_cmd_dispatcher.c b/mixguile/xmixguile_cmd_dispatcher.c index 2ccd19c..649471c 100644 --- a/mixguile/xmixguile_cmd_dispatcher.c +++ b/mixguile/xmixguile_cmd_dispatcher.c @@ -1,9 +1,7 @@  /* -*-c-*- -------------- xmixguile_cmd_dispatcher.c :   * Implementation of the functions declared in xmixguile_cmd_dispatcher.h   * ------------------------------------------------------------------ - * $Id: xmixguile_cmd_dispatcher.c,v 1.14 2005/09/20 19:50:26 jao Exp $ - * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by | 
