Clean up management utilities

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34416 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/manage/cmd/Makefile

@@ -3,10 +3,10 @@ MODULE_TOPDIR = ../../..
 
 PROGRAMS = g.copy g.list g.remove g.rename
 
-g_copy_OBJS = copy.o init.o
-g_list_OBJS = list.o init.o
-g_remove_OBJS = remove.o init.o
-g_rename_OBJS = rename.o init.o
+g_copy_OBJS = copy.o
+g_list_OBJS = list.o
+g_remove_OBJS = remove.o
+g_rename_OBJS = rename.o
 
 include $(MODULE_TOPDIR)/include/Make/Multi.make
 

general/manage/cmd/copy.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <grass/glocale.h>
 #include <grass/list.h>
-#include "local_proto.h"
 
 int main(int argc, char *argv[])
 {
@@ -33,7 +32,9 @@ int main(int argc, char *argv[])
     char *from, *to;
     int result = EXIT_SUCCESS;
 
-    init(argv[0]);
+    G_gisinit(argv[0]);
+
+    read_list(0);
 
     module = G_define_module();
     module->keywords = _("general, map management");

general/manage/cmd/init.c

@@ -1,11 +0,0 @@
-#include <grass/list.h>
-#include "local_proto.h"
-
-int init(char *pgm)
-{
-    G_gisinit(pgm);
-
-    read_list(0);
-
-    return 0;
-}

general/manage/cmd/list.c

@@ -22,10 +22,11 @@
 #include <unistd.h>
 #include <grass/spawn.h>
 #include <grass/list.h>
-#include "local_proto.h"
 
 struct Option *element;
 
+int parse(const char *data_type);
+
 int main(int argc, char *argv[])
 {
     int i, n, len;
@@ -34,7 +35,9 @@ int main(int argc, char *argv[])
     struct Flag *full;
     char *str;
 
-    init(argv[0]);
+    G_gisinit(argv[0]);
+
+    read_list(0);
 
     module = G_define_module();
     module->keywords = _("general, map management");

general/manage/cmd/local_proto.h

@@ -1,15 +0,0 @@
-/* copy.c */
-int main(int, char *[]);
-
-/* init.c */
-int init(char *);
-
-/* list.c */
-int main(int, char *[]);
-int parse(const char *);
-
-/* remove.c */
-int main(int, char *[]);
-
-/* rename.c */
-int main(int, char *[]);

general/manage/cmd/remove.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <grass/glocale.h>
 #include <grass/list.h>
-#include "local_proto.h"
 
 static int check_reclass(const char *name, const char *mapset, int force)
 {
@@ -92,7 +91,9 @@ int main(int argc, char *argv[])
     int result = EXIT_SUCCESS;
     int force = 0;
 
-    init(argv[0]);
+    G_gisinit(argv[0]);
+
+    read_list(0);
 
     module = G_define_module();
     module->keywords = _("general, map management");

general/manage/cmd/rename.c

@@ -22,7 +22,6 @@
 #include <grass/gis.h>
 #include <grass/glocale.h>
 #include <grass/list.h>
-#include "local_proto.h"
 
 int main(int argc, char *argv[])
 {
@@ -34,7 +33,9 @@ int main(int argc, char *argv[])
     char *mapset, *location_path, **rmaps;
     int result = EXIT_SUCCESS;
 
-    init(argv[0]);
+    G_gisinit(argv[0]);
+
+    read_list(0);
 
     module = G_define_module();
     module->keywords = _("general, map management");