[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/src/main.c,v
From: |
Eric Blake |
Subject: |
Changes to m4/src/main.c,v |
Date: |
Wed, 04 Oct 2006 03:57:04 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 06/10/04 03:57:01
Index: src/main.c
===================================================================
RCS file: /sources/m4/m4/src/main.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- src/main.c 29 Sep 2006 18:20:13 -0000 1.91
+++ src/main.c 4 Oct 2006 03:57:01 -0000 1.92
@@ -23,7 +23,6 @@
#include "m4private.h"
#include "getopt.h"
#include "version-etc.h"
-#include "gnu/progname.h"
#include "pathconf.h"
#include "xstrtol.h"
@@ -64,10 +63,10 @@
{
if (status != EXIT_SUCCESS)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
- program_name);
+ m4_get_program_name ());
else
{
- printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name);
+ printf (_("Usage: %s [OPTION]... [FILE]...\n"), m4_get_program_name ());
fputs (_("\
Process macros in FILEs.\n\
If no FILE or if FILE is `-', standard input is read. With no FILE and both\n\
@@ -276,7 +275,7 @@
int exit_status;
/* Initialize gnulib error module. */
- set_program_name (argv[0]);
+ m4_set_program_name (argv[0]);
setlocale (LC_ALL, "");
#ifdef ENABLE_NLS
@@ -504,7 +503,7 @@
if (debugfile && !m4_debug_set_output (context, debugfile))
m4_error (context, 0, errno, _("cannot set debug file `%s'"), debugfile);
m4_input_init (context);
- m4_output_init ();
+ m4_output_init (context);
m4_include_env_init (context);
if (frozen_file_to_read)
@@ -650,7 +649,7 @@
produce_frozen_state (context, frozen_file_to_write);
else
{
- m4_make_diversion (0);
+ m4_make_diversion (context, 0);
m4_undivert_all (context);
}
- Changes to m4/src/main.c,v,
Eric Blake <=
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/05
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/06
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/11
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/13
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/16
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/21
- Changes to m4/src/main.c,v, Eric Blake, 2006/10/27