# CFLAGS
# Hack any other program defining a main() replacing its main by
# _single_binary_main_$PROGRAM_NAME.
- echo "${base}_CFLAGS = \"-Dmain=_single_binary_main_${cmd}(int, char**) " \
- "ATTRIBUTE_NORETURN; int _single_binary_main_${cmd}\" " \
+ echo "${base}_CFLAGS = \"-Dmain=_single_binary_main_${cmd} (int, char **);" \
+ " int _single_binary_main_${cmd}\" " \
"-Dusage=_usage_${cmd} \$(src_coreutils_CFLAGS)"
var=src_${cmd}_CFLAGS
eval "value=\$$var"
error (EXIT_FAILURE, errno, "%s", infile);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
perform_basename (argv[optind],
optind + 2 == argc ? argv[optind + 1] : NULL, use_nuls);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (have_read_stdin && close (STDIN_FILENO) < 0)
error (EXIT_FAILURE, errno, _("closing standard input"));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
ok = process_files (argv + optind, bit_flags | FTS_NOSTAT);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
chopt_free (&chopt);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
ok = process_files (argv + optind,
FTS_COMFOLLOW | FTS_PHYSICAL | FTS_DEFER_STAT);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
chopt_free (&chopt);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (parse_additional_groups (groups, &in_gids, &n_gids, !n_gids) != 0)
{
if (! n_gids)
- exit (EXIT_CANCELED);
+ return EXIT_CANCELED;
/* else look-up outside the chroot worked, then go with those. */
}
else
/* Execute the given command. */
execvp (argv[0], argv);
- {
- int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
- error (0, errno, _("failed to run command %s"), quote (argv[0]));
- exit (exit_status);
- }
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
+ error (0, errno, _("failed to run command %s"), quote (argv[0]));
+ return exit_status;
}
crc_remainder (i * 5 + 5));
}
printf ("\n};\n");
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
#else /* !CRCTAB */
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
#endif /* !CRCTAB */
compare_files (argv + optind);
if (issued_disorder_warning[0] || issued_disorder_warning[1])
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
else
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
#include "uname.h"
/* Ensure that the main for uname is declared even if the tool is not being
built in this single-binary. */
-int _single_binary_main_uname (int argc, char** argv) ATTRIBUTE_NORETURN;
-int _single_binary_main_arch (int argc, char** argv) ATTRIBUTE_NORETURN;
+int _single_binary_main_uname (int argc, char **argv);
+int _single_binary_main_arch (int argc, char **argv);
-int _single_binary_main_arch (int argc, char** argv)
+int
+_single_binary_main_arch (int argc, char **argv)
{
uname_mode = UNAME_ARCH;
- _single_binary_main_uname (argc, argv);
+ return _single_binary_main_uname (argc, argv);
}
#include "ls.h"
/* Ensure that the main for ls is declared even if the tool is not being built
in this single-binary. */
-int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN;
-int _single_binary_main_dir (int argc, char** argv) ATTRIBUTE_NORETURN;
+int _single_binary_main_ls (int argc, char **argv);
+int _single_binary_main_dir (int argc, char **argv);
-int _single_binary_main_dir (int argc, char** argv)
+int
+_single_binary_main_dir (int argc, char **argv)
{
ls_mode = LS_MULTI_COL;
- _single_binary_main_ls (argc, argv);
+ return _single_binary_main_ls (argc, argv);
}
#include "ls.h"
/* Ensure that the main for ls is declared even if the tool is not being built
in this single-binary. */
-int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN;
-int _single_binary_main_vdir (int argc, char** argv) ATTRIBUTE_NORETURN;
+int _single_binary_main_ls (int argc, char **argv);
+int _single_binary_main_vdir (int argc, char **argv);
-int _single_binary_main_vdir (int argc, char** argv)
+int
+_single_binary_main_vdir (int argc, char** argv)
{
ls_mode = LS_LONG_FORMAT;
- _single_binary_main_ls (argc, argv);
+ return _single_binary_main_ls (argc, argv);
}
needs to match the one passed as CFLAGS on single-binary.mk (generated
by gen-single-binary.sh). */
# define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \
- int _single_binary_main_##main_name (int, char**) ATTRIBUTE_NORETURN;
+ int _single_binary_main_##main_name (int, char **);
# include "coreutils.h"
# undef SINGLE_BINARY_PROGRAM
#endif
#define AUTHORS \
proper_name ("Alex Deymo")
-void
-launch_program (const char *prog_name, int prog_argc, char **prog_argv);
-
static struct option const long_options[] =
{
{GETOPT_HELP_OPTION_DECL},
exit (status);
}
-void
+static void
launch_program (const char *prog_name, int prog_argc, char **prog_argv)
{
- int (*prog_main)(int, char **) = NULL;
+ int (*prog_main) (int, char **) = NULL;
/* Ensure that at least one parameter was passed. */
if (!prog_argc || !prog_argv || !prog_argv[0] || !prog_name)
#ifdef SINGLE_BINARY
if (false);
- /* Lookup the right main program. */
+ /* Look up the right main program. */
# define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \
else if (STREQ (prog_name_str, prog_name)) \
prog_main = _single_binary_main_##main_name;
prctl (PR_SET_MM_ARG_START, prog_argv[0]);
#endif
- exit ((*prog_main) (prog_argc, prog_argv));
+ exit (prog_main (prog_argc, prog_argv));
}
int
forget_all ();
#endif
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
cleanup_fatal ();
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
void
ok = false;
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
ok &= show_date (format, when);
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/* Display the date and/or time in WHEN according to the format specified
}
}
-static void ATTRIBUTE_NORETURN
-quit (int code)
+static void
+finish_up (void)
{
cleanup ();
print_stats ();
process_signals ();
+}
+
+static void ATTRIBUTE_NORETURN
+quit (int code)
+{
+ finish_up ();
exit (code);
}
invalidate_cache (STDOUT_FILENO, 0);
}
- quit (exit_status);
+ finish_up ();
+ return exit_status;
}
}
}
if (match)
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
}
if (optind < argc)
IF_LINT (free (columns));
- exit (exit_status);
+ return exit_status;
}
}
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
putchar (use_nuls ? '\0' :'\n');
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (print_grand_total)
print_size (&tot_dui, _("total"));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
{
version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS,
(char *) NULL);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
}
{
case 'a': c = '\a'; break;
case 'b': c = '\b'; break;
- case 'c': exit (EXIT_SUCCESS);
+ case 'c': return EXIT_SUCCESS;
case 'e': c = '\x1B'; break;
case 'f': c = '\f'; break;
case 'n': c = '\n'; break;
if (display_return)
putchar ('\n');
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
char *const *e = environ;
while (*e)
printf ("%s%c", *e++, opt_nul_terminate_output ? '\0' : '\n');
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (opt_nul_terminate_output)
execvp (argv[optind], &argv[optind]);
- {
- int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
- error (0, errno, "%s", argv[optind]);
- exit (exit_status);
- }
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
+ error (0, errno, "%s", argv[optind]);
+ return exit_status;
}
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
- exit (exit_status);
+ return exit_status;
}
syntax_error ();
printv (v);
- exit (null (v));
+ return null (v);
}
/* Return a VALUE for I. */
}
#endif
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
}
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/* Trim space from the front and back of the string P, yielding the prefix,
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
print_float (FLT);
print_float (DBL);
print_float (LDBL);
+
+ return EXIT_SUCCESS;
}
}
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (have_read_stdin && close (STDIN_FILENO) < 0)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
printf ("%08x\n", id);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
usage (EXIT_FAILURE);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
putchar (opt_zero ? '\0' : '\n');
IF_LINT (free (pw_name));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/* Convert a gid_t to string. Do not use this function directly.
}
}
- exit (exit_status);
+ return exit_status;
}
error (EXIT_FAILURE, errno, "%s", g_names[1]);
if (issued_disorder_warning[0] || issued_disorder_warning[1])
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
else
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
usage (EXIT_FAILURE);
}
- exit (list
- ? list_signals (table, optind < argc ? argv + optind : NULL)
- : send_signals (signum, argv + optind));
+ return (list
+ ? list_signals (table, optind < argc ? argv + optind : NULL)
+ : send_signals (signum, argv + optind));
}
error (EXIT_FAILURE, errno, _("cannot create link %s to %s"),
quote_n (0, argv[optind + 1]), quote_n (1, argv[optind]));
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
else
ok = do_link (file[0], file[1]);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
usage (EXIT_FAILURE);
}
- /* POSIX requires using getlogin (or equivalent code). */
+ /* POSIX requires using getlogin (or equivalent code) and prohibits
+ using a fallback technique. */
cp = getlogin ();
- if (cp)
- {
- puts (cp);
- exit (EXIT_SUCCESS);
- }
- /* POSIX prohibits using a fallback technique. */
+ if (! cp)
+ error (EXIT_FAILURE, 0, _("no login name"));
- error (0, 0, _("no login name"));
- exit (EXIT_FAILURE);
+ puts (cp);
+ return EXIT_SUCCESS;
}
hash_free (active_dir_set);
}
- exit (exit_status);
+ return exit_status;
}
/* Set all the option flags according to the switches specified.
}
limit = atoi (argv[1]);
if (limit < 3)
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
/* Make limit odd */
if ( !(limit & 1))
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, _("standard input"));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
options.mode = S_IRWXUGO;
}
- exit (savewd_process_files (argc - optind, argv + optind,
- process_dir, &options));
+ return savewd_process_files (argc - optind, argv + optind,
+ process_dir, &options);
}
}
}
- exit (exit_status);
+ return exit_status;
}
error (EXIT_FAILURE, errno, _("cannot set permissions of %s"),
quote (argv[optind]));
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
free (template);
#endif
- exit (status);
+ return status;
}
else
ok = movefile (file[0], file[1], false, &x);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (current_niceness == -1 && errno != 0)
error (EXIT_CANCELED, errno, _("cannot get niceness"));
printf ("%d\n", current_niceness);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
errno = 0;
encountered a write failure, there is no need to try calling
error() again. */
if (ferror (stderr))
- exit (EXIT_CANCELED);
+ return EXIT_CANCELED;
}
execvp (argv[i], &argv[i]);
- {
- int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
- error (0, errno, "%s", argv[i]);
- exit (exit_status);
- }
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
+ error (0, errno, "%s", argv[i]);
+ return exit_status;
}
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (ignoring_input)
{
if (fd_reopen (STDIN_FILENO, "/dev/null", O_WRONLY, 0) < 0)
- {
- error (0, errno, _("failed to render standard input unusable"));
- exit (exit_internal_failure);
- }
+ error (exit_internal_failure, errno,
+ _("failed to render standard input unusable"));
if (!redirecting_stdout && !redirecting_stderr)
error (0, 0, _("ignoring input"));
}
if (in_home)
error (0, saved_errno2, _("failed to open %s"),
quote (in_home));
- exit (exit_internal_failure);
+ return exit_internal_failure;
}
file = in_home;
}
error() again, particularly since we may have just changed the
underlying fd out from under stderr. */
if (ferror (stderr))
- exit (exit_internal_failure);
+ return exit_internal_failure;
signal (SIGHUP, SIG_IGN);
- {
- int exit_status;
- int saved_errno;
- char **cmd = argv + optind;
-
- execvp (*cmd, cmd);
- exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
- saved_errno = errno;
-
- /* The execve failed. Output a diagnostic to stderr only if:
- - stderr was initially redirected to a non-tty, or
- - stderr was initially directed to a tty, and we
- can dup2 it to point back to that same tty.
- In other words, output the diagnostic if possible, but only if
- it will go to the original stderr. */
- if (dup2 (saved_stderr_fd, STDERR_FILENO) == STDERR_FILENO)
- error (0, saved_errno, _("failed to run command %s"), quote (*cmd));
-
- exit (exit_status);
- }
+ char **cmd = argv + optind;
+ execvp (*cmd, cmd);
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
+ int saved_errno = errno;
+
+ /* The execve failed. Output a diagnostic to stderr only if:
+ - stderr was initially redirected to a non-tty, or
+ - stderr was initially directed to a tty, and we
+ can dup2 it to point back to that same tty.
+ In other words, output the diagnostic if possible, but only if
+ it will go to the original stderr. */
+ if (dup2 (saved_stderr_fd, STDERR_FILENO) == STDERR_FILENO)
+ error (0, saved_errno, _("failed to run command %s"), quote (*cmd));
+
+ return exit_status;
}
printf ("%lu\n", nproc);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (!valid_numbers && _invalid != inval_warn && _invalid != inval_ignore)
exit_status = EXIT_CONVERSION_WARNINGS;
- exit (exit_status);
+ return exit_status;
}
}
if (!ok)
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
if (flag_dump_strings && n_specs > 0)
error (EXIT_FAILURE, 0,
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, _("standard input"));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
ok &= validate_file_name (argv[optind],
check_basic_portability, check_extra_portability);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/* If FILE contains a component with a leading "-", report an error
else
long_pinky (n_users, argv + optind);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, _("standard input"));
- if (failed_opens)
- exit (EXIT_FAILURE);
- exit (EXIT_SUCCESS);
+ return failed_opens ? EXIT_FAILURE : EXIT_SUCCESS;
}
/* Parse options of the form -scNNN.
ok = (matches == argc - optind);
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
{
version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS,
(char *) NULL);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
}
_("warning: ignoring excess arguments, starting with %s"),
quote (argv[0]));
- exit (exit_status);
+ return exit_status;
}
/* All done. */
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (wd)
{
puts (wd);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
}
file_name_free (file_name);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
}
}
- exit (status);
+ return status;
}
for (; optind < argc; ++optind)
ok &= process_path (argv[optind], can_mode);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (argc <= optind)
{
if (x.ignore_missing_files)
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
else
{
error (0, 0, _("missing operand"));
select_plural (n_files))),
program_name, n_files);
if (!yesno ())
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
enum RM_status status = rm (file, &x);
assert (VALID_STATUS (status));
- exit (status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS);
+ return status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS;
}
}
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
error (EXIT_FAILURE, errno, _("failed to get current context"));
fputs (cur_context, stdout);
fputc ('\n', stdout);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (!(user || role || type || range || compute_trans))
execvp (argv[optind], argv + optind);
- {
- int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
- error (0, errno, "%s", argv[optind]);
- exit (exit_status);
- }
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
+ error (0, errno, "%s", argv[optind]);
+ return exit_status;
}
char const *s1 = n_args == 1 ? "1" : argv[optind];
char const *s2 = argv[optind + (n_args - 1)];
if (seq_fast (s1, s2))
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
/* Upon any failure, let the more general code deal with it. */
}
{
IF_LINT (free (s1));
IF_LINT (free (s2));
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
free (s1);
print_numbers (format_str, layout, first.value, step.value, last.value);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
free (qname);
}
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/*
* vim:sw=2:sts=2:
}
#endif
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (xnanosleep (seconds))
error (EXIT_FAILURE, errno, _("cannot read realtime clock"));
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
/* POSIX requires that sort return 1 IFF invoked with -c or -C and the
input is not properly sorted. */
- exit (check (files[0], checkonly) ? EXIT_SUCCESS : SORT_OUT_OF_ORDER);
+ return check (files[0], checkonly) ? EXIT_SUCCESS : SORT_OUT_OF_ORDER;
}
/* Check all inputs are accessible, or exit immediately. */
if (have_read_stdin && fclose (stdin) == EOF)
die (_("close failed"), "-");
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
error (EXIT_FAILURE, errno, "%s", infile);
closeout (NULL, output_desc, filter_pid, outfile);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
? do_statfs (argv[i], format)
: do_stat (argv[i], format, format2));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
execvp (*argv, argv);
- {
- int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
- error (0, errno, _("failed to run command %s"), quote (argv[0]));
- exit (exit_status);
- }
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
+ error (0, errno, _("failed to run command %s"), quote (argv[0]));
+ return exit_status;
}
max_col = screen_columns ();
current_col = 0;
display_settings (output_type, &mode, device_name);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
speed_was_set = false;
}
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
/* Return false if not applied because not reversible; otherwise
if (have_read_stdin && fclose (stdin) == EOF)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
error (0, 0, _("ignoring all arguments"));
sync ();
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
free (G_buffer - offset);
#endif
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/* Don't read anything if we'll never output anything. */
if (! n_units && ! forever && ! from_start)
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
F = xnmalloc (n_files, sizeof *F);
for (i = 0; i < n_files; i++)
error (EXIT_FAILURE, errno, _("write error"));
if (!tail_forever_inotify (wd, F, n_files, sleep_interval))
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
}
error (0, errno, _("inotify cannot be used, reverting to polling"));
}
if (have_read_stdin && close (STDIN_FILENO) < 0)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
if (close (STDIN_FILENO) != 0)
error (EXIT_FAILURE, errno, _("standard input"));
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
/* Copy the standard input into each of the NFILES files in FILES
#if defined TEST_STANDALONE
# define test_exit(val) exit (val)
+# define test_main_return(val) return val
#else
static jmp_buf test_exit_buf;
static int test_error_return = 0;
# define test_exit(val) test_error_return = val, longjmp (test_exit_buf, 1)
+# define test_main_return(val) test_exit (val)
#endif /* !TEST_STANDALONE */
static int pos; /* The offset of the current argument in ARGV. */
{
version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS,
(char *) NULL);
- test_exit (EXIT_SUCCESS);
+ test_main_return (EXIT_SUCCESS);
}
}
if (margc < 2 || !STREQ (margv[margc - 1], "]"))
pos = 1;
if (pos >= argc)
- test_exit (TEST_FALSE);
+ test_main_return (TEST_FALSE);
value = posixtest (argc - 1);
if (pos != argc)
test_syntax_error (_("extra argument %s"), quote (argv[pos]));
- test_exit (value ? TEST_TRUE : TEST_FALSE);
+ test_main_return (value ? TEST_TRUE : TEST_FALSE);
}
if (monitored_pid == -1)
{
error (0, errno, _("fork system call failed"));
- exit (EXIT_CANCELED);
+ return EXIT_CANCELED;
}
else if (monitored_pid == 0)
{ /* child */
- int exit_status;
-
/* exec doesn't reset SIG_IGN -> SIG_DFL. */
signal (SIGTTIN, SIG_DFL);
signal (SIGTTOU, SIG_DFL);
execvp (argv[0], argv); /* FIXME: should we use "sh -c" ... here? */
/* exit like sh, env, nohup, ... */
- exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
+ int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE;
error (0, errno, _("failed to run command %s"), quote (argv[0]));
- exit (exit_status);
+ return exit_status;
}
else
{
}
if (timed_out && !preserve_status)
- exit (EXIT_TIMEDOUT);
- else
- exit (status);
+ status = EXIT_TIMEDOUT;
+ return status;
}
}
for (; optind < argc; ++optind)
ok &= touch (argv[optind]);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
spec_init (s1);
if (!parse_str (argv[optind], s1))
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
if (non_option_args == 2)
{
spec_init (s2);
if (!parse_str (argv[optind + 1], s2))
- exit (EXIT_FAILURE);
+ return EXIT_FAILURE;
}
else
s2 = NULL;
if (close (STDIN_FILENO) != 0)
error (EXIT_FAILURE, errno, _("standard input"));
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
(char *) NULL);
}
- exit (EXIT_STATUS);
+ return EXIT_STATUS;
}
}
}
- exit (errors ? EXIT_FAILURE : EXIT_SUCCESS);
+ return errors ? EXIT_FAILURE : EXIT_SUCCESS;
}
ok = tsort (optind == argc ? "-" : argv[optind]);
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
puts (_("not a tty"));
}
- exit (isatty (STDIN_FILENO) ? EXIT_SUCCESS : EXIT_FAILURE);
+ return isatty (STDIN_FILENO) ? EXIT_SUCCESS : EXIT_FAILURE;
}
putchar ('\n');
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
- exit (exit_status);
+ return exit_status;
}
check_file (file[0], file[1], delimiter);
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (unlink (argv[optind]) != 0)
error (EXIT_FAILURE, errno, _("cannot unlink %s"), quote (argv[optind]));
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
usage (EXIT_FAILURE);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
usage (EXIT_FAILURE);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
if (have_read_stdin && close (STDIN_FILENO) != 0)
error (EXIT_FAILURE, errno, "-");
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ return ok ? EXIT_SUCCESS : EXIT_FAILURE;
}
usage (EXIT_FAILURE);
}
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
errno = 0;
uid = geteuid ();
pw = (uid == NO_UID && errno ? NULL : getpwuid (uid));
- if (pw)
- {
- puts (pw->pw_name);
- exit (EXIT_SUCCESS);
- }
- fprintf (stderr, _("%s: cannot find name for user ID %lu\n"),
- program_name, (unsigned long int) uid);
- exit (EXIT_FAILURE);
+ if (!pw)
+ error (EXIT_FAILURE, errno, "cannot find name for user ID %lu",
+ (unsigned long int) uid);
+ puts (pw->pw_name);
+ return EXIT_SUCCESS;
}
for (i = optind; i < argc; i++)
if (fputs (argv[i], stdout) == EOF
|| putchar (i == argc - 1 ? '\n' : ' ') == EOF)
- error (EXIT_FAILURE, errno, _("standard output"));
+ {
+ error (0, errno, _("standard output"));
+ return EXIT_FAILURE;
+ }
}
}
projects / thirdparty / coreutils.git / commitdiff
