Index: main_act.c =================================================================== --- main_act.c (revision 29402) +++ main_act.c (revision 29403) @@ -5,6 +5,7 @@ * (this file is based on PCB, interactive printed circuit board design) * Copyright (C) 1994,1995,1996 Thomas Nau * Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton + * Copyright (C) 2020 Tibor 'Igor2' Palinkas * * 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 @@ -47,34 +48,13 @@ #include #include "layer.h" #include -#include #include "conf_core.h" -#include #include "build_run.h" -#include #include #include "flag_str.h" #include "obj_common.h" #include -static const char pcb_acts_PrintActions[] = "PrintActions()"; -static const char pcb_acth_PrintActions[] = "Print all actions available."; -fgw_error_t pcb_act_PrintActions(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - pcb_print_actions(); - PCB_ACT_IRES(0); - return 0; -} - -static const char pcb_acts_DumpActions[] = "DumpActions()"; -static const char pcb_acth_DumpActions[] = "Dump all actions available."; -fgw_error_t pcb_act_DumpActions(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - pcb_dump_actions(); - PCB_ACT_IRES(0); - return 0; -} - /* print usage lines */ static inline void u(const char *fmt, ...) { @@ -263,65 +243,6 @@ return 0; } - -static const char pcb_acts_PrintFiles[] = "PrintFiles()"; -static const char pcb_acth_PrintFiles[] = "Print files currently loaded."; -static void print_cat(pcb_file_loaded_t *cat) -{ - htsp_entry_t *e; - printf("%s\n", cat->name); - for (e = htsp_first(&cat->data.category.children); e; e = htsp_next(&cat->data.category.children, e)) { - pcb_file_loaded_t *file = e->value; - printf(" %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc); - } -} -fgw_error_t pcb_act_PrintFiles(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - htsp_entry_t *e; - printf("# Data files loaded\n"); - for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) - print_cat(e->value); - PCB_ACT_IRES(0); - return 0; -} - -static const char pcb_acts_DumpPlugins[] = "DumpPlugins()"; -static const char pcb_acth_DumpPlugins[] = "Print plugins loaded in a format digestable by scripts."; -fgw_error_t pcb_act_DumpPlugins(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - pup_plugin_t *p; - const pup_buildin_t **bu; - int n; - - printf("#state\tname\tbuildin\tautoload\trefco\tloaded_from\n"); - - for(p = pcb_pup.plugins; p != NULL; p = p->next) - printf("loaded\t%s\t%d\t%d\t%d\t%s\n", - p->name, - !!(p->flags & PUP_FLG_STATIC), !!(p->flags & PUP_FLG_AUTOLOAD), p->references, - (p->path == NULL ? "" : p->path)); - - for(n = 0, bu = pcb_pup.bu; n < pcb_pup.bu_used; n++, bu++) - if (pup_lookup(&pcb_pup, (*bu)->name) == NULL) - printf("unloaded buildin\t%s\t1\t0\t0\t\n", (*bu)->name); - - PCB_ACT_IRES(0); - return 0; -} - - -static const char pcb_acts_DumpPluginDirs[] = "DumpPluginDirs()"; -static const char pcb_acth_DumpPluginDirs[] = "Print plugins directories in a format digestable by scripts."; -fgw_error_t pcb_act_DumpPluginDirs(fgw_arg_t *res, int argc, fgw_arg_t *argv) -{ - char **p; - for(p = pcb_pup_paths; *p != NULL; p++) - printf("%s\n", *p); - - PCB_ACT_IRES(0); - return 0; -} - static const char pcb_acts_DumpObjFlags[] = "DumpObjFlags()"; static const char pcb_acth_DumpObjFlags[] = "Print a script processable digest of all flags, per object type"; static void dumpoflg(void *ctx, unsigned long flg, const pcb_flag_bits_t *fb) @@ -421,16 +342,11 @@ } static pcb_action_t main_action_list[] = { - {"PrintActions", pcb_act_PrintActions, pcb_acth_PrintActions, pcb_acts_PrintActions}, - {"DumpActions", pcb_act_DumpActions, pcb_acth_DumpActions, pcb_acts_DumpActions}, {"PrintUsage", pcb_act_PrintUsage, pcb_acth_PrintUsage, pcb_acts_PrintUsage}, {"PrintVersion", pcb_act_PrintVersion, pcb_acth_PrintVersion, pcb_acts_PrintVersion}, {"DumpVersion", pcb_act_DumpVersion, pcb_acth_DumpVersion, pcb_acts_DumpVersion}, {"PrintCopyright", pcb_act_PrintCopyright, pcb_acth_PrintCopyright, pcb_acts_PrintCopyright}, {"PrintPaths", pcb_act_PrintPaths, pcb_acth_PrintPaths, pcb_acts_PrintPaths}, - {"PrintFiles", pcb_act_PrintFiles, pcb_acth_PrintFiles, pcb_acts_PrintFiles}, - {"DumpPlugins", pcb_act_DumpPlugins, pcb_acth_DumpPlugins, pcb_acts_DumpPlugins}, - {"DumpPluginDirs", pcb_act_DumpPluginDirs, pcb_acth_DumpPluginDirs, pcb_acts_DumpPluginDirs}, {"DumpObjFlags", pcb_act_DumpObjFlags, pcb_acth_DumpObjFlags, pcb_acts_DumpObjFlags}, {"System", pcb_act_System, pcb_acth_System, pcb_acts_System}, {"ExecCommand", pcb_act_System, pcb_acth_System, pcb_acts_System},