/[make]/make/main.c
ViewVC logotype

Diff of /make/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.198 by bosk, Sun Feb 27 22:24:31 2005 UTC revision 1.199 by psmith, Mon Feb 28 07:48:22 2005 UTC
# Line 193  int no_builtin_variables_flag = 0; Line 193  int no_builtin_variables_flag = 0;
193  int keep_going_flag;  int keep_going_flag;
194  int default_keep_going_flag = 0;  int default_keep_going_flag = 0;
195    
196    /* Nonzero means check symlink mtimes.  */
197    
198    int check_symlink_flag = 0;
199    
200  /* Nonzero means print directory before starting and when done (-w).  */  /* Nonzero means print directory before starting and when done (-w).  */
201    
202  int print_directory_flag = 0;  int print_directory_flag = 0;
# Line 316  static const char *const usage[] = Line 320  static const char *const usage[] =
320    -l [N], --load-average[=N], --max-load[=N]\n\    -l [N], --load-average[=N], --max-load[=N]\n\
321                                Don't start multiple jobs unless load is below N.\n"),                                Don't start multiple jobs unless load is below N.\n"),
322      N_("\      N_("\
323      -L, --check-symlink-times   Use the latest mtime between symlinks and target.\n"),
324        N_("\
325    -n, --just-print, --dry-run, --recon\n\    -n, --just-print, --dry-run, --recon\n\
326                                Don't actually run any commands; just print them.\n"),                                Don't actually run any commands; just print them.\n"),
327      N_("\      N_("\
# Line 363  static const struct command_switch switc Line 369  static const struct command_switch switc
369      { 'D', flag, (char *) &suspend_flag, 1, 1, 0, 0, 0, "suspend-for-debug" },      { 'D', flag, (char *) &suspend_flag, 1, 1, 0, 0, 0, "suspend-for-debug" },
370  #endif  #endif
371      { 'e', flag, (char *) &env_overrides, 1, 1, 0, 0, 0,      { 'e', flag, (char *) &env_overrides, 1, 1, 0, 0, 0,
372          "environment-overrides", },        "environment-overrides", },
373      { 'f', string, (char *) &makefiles, 0, 0, 0, 0, 0, "file" },      { 'f', string, (char *) &makefiles, 0, 0, 0, 0, 0, "file" },
374      { 'h', flag, (char *) &print_usage_flag, 0, 0, 0, 0, 0, "help" },      { 'h', flag, (char *) &print_usage_flag, 0, 0, 0, 0, 0, "help" },
375      { 'i', flag, (char *) &ignore_errors_flag, 1, 1, 0, 0, 0,      { 'i', flag, (char *) &ignore_errors_flag, 1, 1, 0, 0, 0,
376          "ignore-errors" },        "ignore-errors" },
377      { 'I', string, (char *) &include_directories, 1, 1, 0, 0, 0,      { 'I', string, (char *) &include_directories, 1, 1, 0, 0, 0,
378          "include-dir" },        "include-dir" },
379      { 'j', positive_int, (char *) &job_slots, 1, 1, 0, (char *) &inf_jobs,      { 'j', positive_int, (char *) &job_slots, 1, 1, 0, (char *) &inf_jobs,
380          (char *) &default_job_slots, "jobs" },        (char *) &default_job_slots, "jobs" },
381      { CHAR_MAX+2, string, (char *) &jobserver_fds, 1, 1, 0, 0, 0,      { CHAR_MAX+2, string, (char *) &jobserver_fds, 1, 1, 0, 0, 0,
382          "jobserver-fds" },        "jobserver-fds" },
383      { 'k', flag, (char *) &keep_going_flag, 1, 1, 0, 0,      { 'k', flag, (char *) &keep_going_flag, 1, 1, 0, 0,
384          (char *) &default_keep_going_flag, "keep-going" },        (char *) &default_keep_going_flag, "keep-going" },
385  #ifndef NO_FLOAT  #ifndef NO_FLOAT
386      { 'l', floating, (char *) &max_load_average, 1, 1, 0,      { 'l', floating, (char *) &max_load_average, 1, 1, 0,
387          (char *) &default_load_average, (char *) &default_load_average,        (char *) &default_load_average, (char *) &default_load_average,
388          "load-average" },        "load-average" },
389  #else  #else
390      { 'l', positive_int, (char *) &max_load_average, 1, 1, 0,      { 'l', positive_int, (char *) &max_load_average, 1, 1, 0,
391          (char *) &default_load_average, (char *) &default_load_average,        (char *) &default_load_average, (char *) &default_load_average,
392          "load-average" },        "load-average" },
393  #endif  #endif
394        { 'L', flag, (char *) &check_symlink_flag, 1, 1, 0, 0, 0,
395          "check-symlink-times" },
396      { 'm', ignore, 0, 0, 0, 0, 0, 0, 0 },      { 'm', ignore, 0, 0, 0, 0, 0, 0, 0 },
397      { 'n', flag, (char *) &just_print_flag, 1, 1, 1, 0, 0, "just-print" },      { 'n', flag, (char *) &just_print_flag, 1, 1, 1, 0, 0, "just-print" },
398      { 'o', string, (char *) &old_files, 0, 0, 0, 0, 0, "old-file" },      { 'o', string, (char *) &old_files, 0, 0, 0, 0, 0, "old-file" },
399      { 'p', flag, (char *) &print_data_base_flag, 1, 1, 0, 0, 0,      { 'p', flag, (char *) &print_data_base_flag, 1, 1, 0, 0, 0,
400          "print-data-base" },        "print-data-base" },
401      { 'q', flag, (char *) &question_flag, 1, 1, 1, 0, 0, "question" },      { 'q', flag, (char *) &question_flag, 1, 1, 1, 0, 0, "question" },
402      { 'r', flag, (char *) &no_builtin_rules_flag, 1, 1, 0, 0, 0,      { 'r', flag, (char *) &no_builtin_rules_flag, 1, 1, 0, 0, 0,
403        "no-builtin-rules" },        "no-builtin-rules" },
404      { 'R', flag, (char *) &no_builtin_variables_flag, 1, 1, 0, 0, 0,      { 'R', flag, (char *) &no_builtin_variables_flag, 1, 1, 0, 0, 0,
405          "no-builtin-variables" },        "no-builtin-variables" },
406      { 's', flag, (char *) &silent_flag, 1, 1, 0, 0, 0, "silent" },      { 's', flag, (char *) &silent_flag, 1, 1, 0, 0, 0, "silent" },
407      { 'S', flag_off, (char *) &keep_going_flag, 1, 1, 0, 0,      { 'S', flag_off, (char *) &keep_going_flag, 1, 1, 0, 0,
408        (char *) &default_keep_going_flag, "no-keep-going" },        (char *) &default_keep_going_flag, "no-keep-going" },
409      { 't', flag, (char *) &touch_flag, 1, 1, 1, 0, 0, "touch" },      { 't', flag, (char *) &touch_flag, 1, 1, 1, 0, 0, "touch" },
410      { 'v', flag, (char *) &print_version_flag, 1, 1, 0, 0, 0, "version" },      { 'v', flag, (char *) &print_version_flag, 1, 1, 0, 0, 0, "version" },
411      { 'w', flag, (char *) &print_directory_flag, 1, 1, 0, 0, 0,      { 'w', flag, (char *) &print_directory_flag, 1, 1, 0, 0, 0,
412          "print-directory" },        "print-directory" },
413      { CHAR_MAX+3, flag, (char *) &inhibit_print_directory_flag, 1, 1, 0, 0, 0,      { CHAR_MAX+3, flag, (char *) &inhibit_print_directory_flag, 1, 1, 0, 0, 0,
414          "no-print-directory" },        "no-print-directory" },
415      { 'W', string, (char *) &new_files, 0, 0, 0, 0, 0, "what-if" },      { 'W', string, (char *) &new_files, 0, 0, 0, 0, 0, "what-if" },
416      { CHAR_MAX+4, flag, (char *) &warn_undefined_variables_flag, 1, 1, 0, 0, 0,      { CHAR_MAX+4, flag, (char *) &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
417          "warn-undefined-variables" },        "warn-undefined-variables" },
418      { 0 }      { 0 }
419    };    };
420    
# Line 1461  main (int argc, char **argv, char **envp Line 1469  main (int argc, char **argv, char **envp
1469              outfile = open_tmpfile (&stdin_nm, template);              outfile = open_tmpfile (&stdin_nm, template);
1470              if (outfile == 0)              if (outfile == 0)
1471                pfatal_with_name (_("fopen (temporary file)"));                pfatal_with_name (_("fopen (temporary file)"));
1472              while (!feof (stdin))              while (!feof (stdin) && ! ferror (stdin))
1473                {                {
1474                  char buf[2048];                  char buf[2048];
1475                  unsigned int n = fread (buf, 1, sizeof (buf), stdin);                  unsigned int n = fread (buf, 1, sizeof (buf), stdin);
# Line 1702  main (int argc, char **argv, char **envp Line 1710  main (int argc, char **argv, char **envp
1710      }      }
1711  #endif  #endif
1712    
1713    #ifndef MAKE_SYMLINKS
1714      if (check_symlink_flag)
1715        {
1716          error (NILF, _("Symbolic links not supported: disabling -L."));
1717          check_symlink_flag = 0;
1718        }
1719    #endif
1720    
1721    /* Set up MAKEFLAGS and MFLAGS again, so they will be right.  */    /* Set up MAKEFLAGS and MFLAGS again, so they will be right.  */
1722    
1723    define_makeflags (1, 0);    define_makeflags (1, 0);

Legend:
Removed from v.1.198  
changed lines
  Added in v.1.199

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26