* Tidied-up code for modern autoconf/automake/C99 compiler.

* Fixed apparent very old bug involving use of close instead of fclose. * Updated copyright notices to 2014.
jonathanhogg · Mar 27, 2014 · 3f4365f · 3f4365f
1 parent 50a871b
commit 3f4365f
Show file tree

Hide file tree

Showing 22 changed files with 393 additions and 64 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,5 @@
 Usepackage Environment Manager
-Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 .  
 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
@@ -15,6 +15,14 @@ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+2014-03-27  Jonathan Hogg  <me@jonathanhogg.com>
+
+        * Tidied-up code for modern autoconf/automake/C99 compiler.
+
+        * Fixed apparent very old bug involving use of close instead of fclose.
+
+        * Updated copyright notices to 2014.
+
 2007-06-08  Jonathan Hogg  <jonathan@onegoodidea.com>
 
 	* Tagged version 1.10 for release.

diff --git a/INSTALL b/INSTALL
diff --git a/Makefile.am b/Makefile.am
@@ -1,5 +1,5 @@
 # Usepackage Environment Manager
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 #  
 # 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

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 Usepackage Environment Manager
-Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 
 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

diff --git a/README b/README
@@ -1,5 +1,5 @@
 Usepackage Environment Manager
-Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 
 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
@@ -71,7 +71,7 @@ of available packages with:
 
    % use -l
 
-   usepackage 1.9, Copyright (C) 1995-2007  Jonathan Hogg
+   usepackage 1.9, Copyright (C) 1995-2014  Jonathan Hogg
 
    Available packages are:
 

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Usepackage Environment Manager
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 #  
 # 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

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 # Usepackage Environment Manager
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 #  
 # 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
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 AC_INIT(usepackage,1.10,jonathan@onegoodidea.com,usepackage)
-AM_INIT_AUTOMAKE(usepackage,1.10)
+AM_INIT_AUTOMAKE
 
 AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
@@ -31,15 +31,10 @@ AC_CHECK_HEADER(string.h)
 AC_CHECK_HEADER(sys/utsname.h)
 AC_CHECK_HEADER(dirent.h)
 
-AH_VERBATIM([MAILING_LIST],
-[/* Mailing list address. */
-#ifndef MAILING_LIST
-# define MAILING_LIST "usepackage@onegoodidea.com"
-#endif])
 AH_VERBATIM([COPYRIGHT],
 [/* Copyright string for the executable. */
 #ifndef COPYRIGHT
-# define COPYRIGHT "Copyright (C) 1995-2007  Jonathan Hogg"
+# define COPYRIGHT "Copyright (C) 1995-2014  Jonathan Hogg"
 #endif])
 
 AC_OUTPUT(Makefile)
diff --git a/grammar.y b/grammar.y
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  * 
  * 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
@@ -55,6 +55,8 @@ char file_name[10][256];
 FILE* file[10];
 
 int include(char* filename);
+int yyerror();
+extern int yylex();
 
 %}
 
@@ -303,7 +305,7 @@ int get_packages(linked_list** packages, linked_list** groups,
 
 int yywrap()
 {
-   close(file[stack_pointer--]);
+   fclose(file[stack_pointer--]);
 
    if (stack_pointer != -1)
    {

diff --git a/linked_list.c b/linked_list.c
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *
  * 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

diff --git a/linked_list.h b/linked_list.h
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *
  * 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

diff --git a/match.c b/match.c
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *
  * 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

diff --git a/package.h b/package.h
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *
  * 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

diff --git a/scanner.l b/scanner.l
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *
  * 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
@@ -36,7 +36,6 @@ static char *bufp;
 extern int stack_pointer;
 extern int line_number[10];
 extern char file_name[10][256];
-extern FILE* file[10];
 
 extern int include(char* filename);
 

diff --git a/use.1.in b/use.1.in
@@ -91,7 +91,7 @@ and detecting the style of environment output that should be used, see
 .SH COPYRIGHT
 .nf
 Usepackage Environment Manager
-Copyright (C) 1995-2007  Jonathan Hogg
+Copyright (C) 1995-2014  Jonathan Hogg
 .fi
 .PP
 This program is free software; you can redistribute it and/or modify

diff --git a/use.bsh.in b/use.bsh.in
@@ -1,5 +1,5 @@
 # Usepackage Environment Manager
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
 #
 # 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

diff --git a/use.csh.in b/use.csh.in
@@ -1,5 +1,5 @@
 # Usepackage Environment Manager 
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com> 
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com> 
 # 
 # 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 

diff --git a/use.ksh.in b/use.ksh.in
@@ -1,5 +1,5 @@
 # Usepackage Environment Manager 
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com> 
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com> 
 # 
 # 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 

diff --git a/usepackage.1.in b/usepackage.1.in
@@ -343,7 +343,7 @@ and detecting the style of environment output that should be used (see
 .SH COPYRIGHT
 .nf
 Usepackage Environment Manager
-Copyright (C) 1995-2007  Jonathan Hogg
+Copyright (C) 1995-2014  Jonathan Hogg
 .fi
 .PP
 This program is free software; you can redistribute it and/or modify

diff --git a/usepackage.c b/usepackage.c
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *  
  * 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
@@ -123,7 +123,6 @@ int main(int argc, char *argv[])
    {
       fprintf(stderr, "\n%s %s, %s\n", PACKAGE_NAME, PACKAGE_VERSION, COPYRIGHT);
       fprintf(stderr, "Bug reports and comments to: %s\n", PACKAGE_BUGREPORT);
-      fprintf(stderr, "Discussion/announcement list: %s\n\n", MAILING_LIST);
       fprintf(stderr, "usage: use [-vs] [-f <file>] <package> [<package>...]\n");
       fprintf(stderr, "       use -l\n\n");
       fprintf(stderr, "       -v : verbose\n");
@@ -174,7 +173,7 @@ int main(int argc, char *argv[])
 
    for (first = i, i = argc - 1 ; i >= first ; i--)
    {
-      if (group = get_group(argv[i]))
+      if ((group = get_group(argv[i])))
          use_group(group);
       else
          use_package(argv[i]);
@@ -239,7 +238,7 @@ void add_package(package_t* package)
       {
          name = (char*) get_value(rnode);
 
-         if (group = get_group(name))
+         if ((group = get_group(name)))
             use_group(group);
          else
             use_package(name);

diff --git a/usepackage.conf b/usepackage.conf
@@ -1,5 +1,5 @@
 # Usepackage Environment Manager 
-# Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com> 
+# Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com> 
 # 
 # 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 

diff --git a/utils.c b/utils.c
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *  
  * 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
@@ -35,6 +35,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
 #include "utils.h"
 
 

diff --git a/utils.h b/utils.h
@@ -2,7 +2,7 @@
 /*****************************************************************************
  * 
  * Usepackage Environment Manager
- * Copyright (C) 1995-2007  Jonathan Hogg  <jonathan@onegoodidea.com>
+ * Copyright (C) 1995-2014  Jonathan Hogg  <jonathan@onegoodidea.com>
  *  
  * 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