The role of the combiner is -partially- assumed by the linker.

Linker arguments are now part of the transformation structure.
Temp file nameing is changed.

diff --git a/util/ack/data.h b/util/ack/data.h
index 53f97b7..5208efc 100644 (file)
--- a/util/ack/data.h
+++ b/util/ack/data.h
@@ -4,13 +4,12 @@
 
 EXTERN  char            *stopsuffix;    /* Suffix to stop at */
 EXTERN  char            *machine;       /* The machine id */
+EXTERN char            *callname;      /* argv[0] */
 EXTERN  char            *rts;           /* The runtime-system id */
 
 EXTERN  list_head       arguments;      /* List of arguments */
 EXTERN  list_head       flags;          /* List of flags */
 
-EXTERN  list_head       c_arguments;    /* List of linker arguments */
-
 EXTERN  list_head       tr_list;        /* List of transformations */
 
 EXTERN  list_head       R_list;         /* List of -R flags */
@@ -22,7 +21,7 @@ EXTERN  int             g_flag;         /* do_run() */
 EXTERN  int             t_flag;         /* Preserve intermediate files */
 EXTERN  int             v_flag;         /* Verbose */
 EXTERN  int             w_flag;         /* Don't print warnings */
-EXTERN  int             nill_flag;      /* Don't file names */
+EXTERN  int             nill_flag;      /* Don't print file names */
 EXTERN  int             Optflag;        /* Optimizing */
 
 #ifdef DEBUG
@@ -34,13 +33,13 @@ EXTERN  int             n_error;        /* Number of errors encountered */
 EXTERN  char            *progname;      /* The program call name */
 
 EXTERN  char            *outfile;       /* The result file e.g. a.out */
-EXTERN  char            *template;      /* The template for temporary file
+EXTERN  char            template[20];   /* The template for temporary file
                                                names */
 
-EXTERN  trf             *combiner;      /* Pointer to the Loader/Linker */
+EXTERN  trf             *linker;       /* Pointer to the Loader/Linker */
 EXTERN  trf             *cpp_trafo;     /* Pointer to C-preprocessor */
 
-EXTERN  path            in;             /* The current input pathname */
+EXTERN  path            in;             /* The current single input pathname */
 EXTERN  path            out;            /* The current output pathname */
 EXTERN  path            orig;           /* The original input path */
 EXTERN  char            *p_basename;    /* The current basename */