Added the information from uname into the help.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index f6c7b12..746e2f0 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -93,7 +93,7 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   if(n_opt + n >= argc) {
     fprintf(stderr, "Selector: Missing argument for %s, expecting %s.\n",
             argv[n_opt], help);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 }
 
@@ -114,7 +114,7 @@ int string_to_positive_integer(char *string) {
     fprintf(stderr,
             "Selector: Value `%s' is not a positive integer.\n",
             string);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   return result;
@@ -672,7 +672,7 @@ void read_file(struct hash_table_t *hash_table,
 
   if(!file) {
     fprintf(stderr, "Selector: Can not open `%s'.\n", input_filename);
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   start = 0;
@@ -708,7 +708,7 @@ void read_file(struct hash_table_t *hash_table,
               BUFFER_SIZE);
       fprintf(stderr, raw_line);
       fprintf(stderr, "\n");
-      exit(1);
+      exit(EXIT_FAILURE);
     }
 
     /* If we got a line, we replace the carriage return by a \0 to
@@ -745,9 +745,9 @@ int main(int argc, char **argv) {
   int nb_lines;
   struct hash_table_t *hash_table;
 
-  if(!ttyname(STDIN_FILENO)) {
+  if(!isatty(STDIN_FILENO)) {
     fprintf(stderr, "Selector: The standard input is not a tty.\n");
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   color_fg_modeline  = COLOR_WHITE;
@@ -763,8 +763,8 @@ int main(int argc, char **argv) {
   i = 1;
 
   while(!error && !show_help &&
-        i < argc && argv[i][0] == '-' &&
-        !rest_are_files) {
+        i < argc &&
+        argv[i][0] == '-' && !rest_are_files) {
 
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
@@ -888,7 +888,7 @@ int main(int argc, char **argv) {
       out = stderr;
     }
 
-    fprintf(out, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER);
+    fprintf(out, "Selector version %s-R%s (%s)\n", VERSION, REVISION_NUMBER, UNAME);
     fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
     fprintf(out, "\n");
     fprintf(out, "Usage: %s [options] [<filename1> [<filename2> ...]]\n",
@@ -1025,7 +1025,7 @@ int main(int argc, char **argv) {
       endwin();
       fprintf(stderr, "Selector: Color numbers have to be between 0 and %d.\n",
               COLORS - 1);
-      exit(1);
+      exit(EXIT_FAILURE);
     }
 
     init_pair(1, color_fg_modeline, color_bg_modeline);
@@ -1177,7 +1177,7 @@ int main(int argc, char **argv) {
         fprintf(stderr,
                 "Selector: Can not open %s for writing.\n",
                 output_filename);
-        exit(1);
+        exit(EXIT_FAILURE);
       }
       fclose(out);
     }
@@ -1195,5 +1195,5 @@ int main(int argc, char **argv) {
   free(lines);
   free(title);
 
-  exit(0);
+  exit(EXIT_SUCCESS);
 }