Changeset f17bff98

Timestamp:

Oct 19, 2003, 11:30:00 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

4664c96

Parents:

c15bbfb

Message:

Added the 'show startup' command
Alphebetized 'show' help.

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (3 diffs)
• functions.c (modified) (1 diff)
• owl.h (modified) (1 diff)

ChangeLog

@@ -3 +3 @@
 2.0.9-pre-4
         Added the 'fancylines' variable.
-        Enabled OWL_STDERR_REDIR by default
+        Enabled OWL_STDERR_REDIR by default.
+        Added the 'show startup' command.
         
 2.0.9-pre-3

commands.c

@@ -568 +568 @@
 
   OWLCMD_ARGS("show", owl_command_show, OWL_CTX_INTERACTIVE,
-              "show information",
-              "show variables\n"
-              "show variable <variable>\n"
+              "show information\n",
+              "show colors\n"
+              "show commands\n"
+              "show command <command>\n"
+              "show errors\n"
               "show filters\n"
               "show filter <filter>\n"
               "show keymaps\n"
               "show keymap <keymap>\n"
-              "show commands\n"
-              "show command <command>\n"
+              "show startup\n"
+              "show status\n"
+              "show styles\n"
               "show subscriptions / show subs\n"
-              "show zpunts\n"
-              "show styles\n"
-              "show colors\n"
               "show terminal\n"
+              "show variables\n"
+              "show variable <variable>\n"
               "show version\n"
               "show view [<view>]\n"
-              "show status\n"
-              "show errors\n",
+              "show zpunts\n",
 
               "Show colors will display a list of valid colors for the\n"
@@ -592 +593 @@
               "Show filter <filter> will show the definition of a particular\n"
               "     filter.\n\n"
+              "Show startup will display the custom startup config\n\n"
               "Show zpunts will show the active zpunt filters.\n\n"
               "Show keymaps will list the names of all keymaps.\n"
@@ -1923 +1925 @@
   } else if (!strcmp(argv[1], "status")) {
     owl_function_status();
+  } else if (!strcmp(argv[1], "startup")) {
+    char *filename;
+    
+    filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
+    owl_function_popless_file(filename);
+    owl_free(filename);
   } else if (!strcmp(argv[1], "errors")) {
     owl_function_showerrs();

functions.c

@@ -1204 +1204 @@
   owl_viewwin_redisplay(v, 0);
   owl_global_set_needrefresh(&g);
+}
+
+void owl_function_popless_file(char *filename)
+{
+  owl_fmtext fm;
+  FILE *file;
+  char buff[1024];
+
+  file=fopen(filename, "r");
+  if (!file) {
+    owl_function_error("Could not open file: %s", filename);
+    return;
+  }
+
+  owl_fmtext_init_null(&fm);
+  while (fgets(buff, 1024, file)) {
+    owl_fmtext_append_normal(&fm, buff);
+    owl_fmtext_append_normal(&fm, "\n");
+  }
+
+  owl_function_popless_fmtext(&fm);
+  owl_fmtext_free(&fm);
+  fclose(file);
 }
 

owl.h

@@ -19 +19 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.9-pre-3
-#define OWL_VERSION_STRING "2.0.9-pre-3"
+#define OWL_VERSION         2.0.9-pre-4
+#define OWL_VERSION_STRING "2.0.9-pre-4"
 
 /* Feature that is being tested to redirect stderr through a pipe.