summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/date.c4
-rw-r--r--src/echo.c10
-rw-r--r--src/expr.c2
-rw-r--r--src/factor.c2
-rw-r--r--src/hostid.c2
-rw-r--r--src/id.c8
-rw-r--r--src/pinky.c22
-rw-r--r--src/printenv.c2
-rw-r--r--src/printf.c26
-rw-r--r--src/spline.c2
-rw-r--r--src/stty.c22
-rw-r--r--src/tty.c2
-rw-r--r--src/uptime.c6
-rw-r--r--src/users.c2
-rw-r--r--src/who.c2
-rw-r--r--src/yes.c2
16 files changed, 58 insertions, 58 deletions
diff --git a/src/date.c b/src/date.c
index 3e4612e0c..5902ba1e5 100644
--- a/src/date.c
+++ b/src/date.c
@@ -182,7 +182,7 @@ batch_convert (const char *input_filename, const char *format)
free (initial_TZ);
- if (fclose (in_stream) == EOF)
+ if (FCLOSE (in_stream) == EOF)
error (2, errno, input_filename);
if (line != NULL)
@@ -353,7 +353,7 @@ argument must be a format string beginning with `+'."),
show_date (format, when);
}
- if (fclose (stdout) == EOF)
+ if (FCLOSE (stdout) == EOF)
error (2, errno, _("write error"));
exit (status);
diff --git a/src/echo.c b/src/echo.c
index 345070a87..7ba50f3ac 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -205,15 +205,15 @@ just_echo:
c = c * 8 + (*s++ - '0');
break;
case '\\': break;
- default: putchar ('\\'); break;
+ default: PUTCHAR ('\\'); break;
}
}
- putchar(c);
+ PUTCHAR(c);
}
argc--;
argv++;
if (argc > 0)
- putchar(' ');
+ PUTCHAR(' ');
}
}
else
@@ -225,11 +225,11 @@ just_echo:
argc--;
argv++;
if (argc > 0)
- putchar (' ');
+ PUTCHAR (' ');
}
}
}
if (display_return)
- putchar ('\n');
+ PUTCHAR ('\n');
exit (0);
}
diff --git a/src/expr.c b/src/expr.c
index abeae7e3e..3af67c446 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -408,7 +408,7 @@ trace (fxn)
printf ("%s:", fxn);
for (a = args; *a; a++)
printf (" %s", *a);
- putchar ('\n');
+ PUTCHAR ('\n');
}
#endif
diff --git a/src/factor.c b/src/factor.c
index 843c58896..ee66c8aee 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -137,7 +137,7 @@ print_factors (const char *s)
printf ("%lu:", n);
for (i = 0; i < n_factors; i++)
printf (" %lu", factors[i]);
- putchar ('\n');
+ PUTCHAR ('\n');
return 0;
}
diff --git a/src/hostid.c b/src/hostid.c
index f7a31fa12..b3a821e51 100644
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
id = gethostid ();
printf ("%lx\n", id);
- if (fclose (stdout) == EOF)
+ if (FCLOSE (stdout) == EOF)
error (EXIT_FAILURE, errno, _("write error"));
exit (EXIT_SUCCESS);
diff --git a/src/id.c b/src/id.c
index 9371a32d0..e32eda596 100644
--- a/src/id.c
+++ b/src/id.c
@@ -170,7 +170,7 @@ main (int argc, char **argv)
print_group_list (argv[optind]);
else
print_full_info (argv[optind]);
- putchar ('\n');
+ PUTCHAR ('\n');
exit (problems != 0);
}
@@ -261,7 +261,7 @@ print_group_list (const char *username)
print_group (rgid);
if (egid != rgid)
{
- putchar (' ');
+ PUTCHAR (' ');
print_group (egid);
}
@@ -280,7 +280,7 @@ print_group_list (const char *username)
for (i = 0; i < n_groups; i++)
if (groups[i] != rgid && groups[i] != egid)
{
- putchar (' ');
+ PUTCHAR (' ');
print_group (groups[i]);
}
free (groups);
@@ -347,7 +347,7 @@ print_full_info (const char *username)
for (i = 0; i < n_groups; i++)
{
if (i > 0)
- putchar (',');
+ PUTCHAR (',');
printf ("%u", (unsigned) groups[i]);
grp = getgrgid (groups[i]);
if (grp == NULL)
diff --git a/src/pinky.c b/src/pinky.c
index db230bf0b..96531f8e4 100644
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -221,7 +221,7 @@ print_entry (const STRUCT_UTMP *utmp_ent)
}
#endif
- putchar ('\n');
+ PUTCHAR ('\n');
}
/* Display a verbose line of information about UTMP_ENT. */
@@ -252,7 +252,7 @@ print_long_entry (const char name[])
printf (" %s", pw->pw_gecos);
}
- putchar ('\n');
+ PUTCHAR ('\n');
if (include_home_and_shell)
{
@@ -260,7 +260,7 @@ print_long_entry (const char name[])
printf ("%-29s", pw->pw_dir);
printf (_("Shell: "));
printf (" %s", pw->pw_shell);
- putchar ('\n');
+ PUTCHAR ('\n');
}
if (include_project)
@@ -281,9 +281,9 @@ print_long_entry (const char name[])
printf (_("Project: "));
- while ((bytes = fread (buf, 1, sizeof (buf), stream)) > 0)
- fwrite (buf, 1, bytes, stdout);
- fclose (stream);
+ while ((bytes = FREAD (buf, 1, sizeof (buf), stream)) > 0)
+ FWRITE (buf, 1, bytes, stdout);
+ FCLOSE (stream);
}
free (project);
@@ -307,15 +307,15 @@ print_long_entry (const char name[])
printf (_("Plan:\n"));
- while ((bytes = fread (buf, 1, sizeof (buf), stream)) > 0)
- fwrite (buf, 1, bytes, stdout);
- fclose (stream);
+ while ((bytes = FREAD (buf, 1, sizeof (buf), stream)) > 0)
+ FWRITE (buf, 1, bytes, stdout);
+ FCLOSE (stream);
}
free (plan);
}
- putchar ('\n');
+ PUTCHAR ('\n');
}
/* Print the username of each valid entry and the number of valid entries
@@ -335,7 +335,7 @@ print_heading (void)
if (include_where)
printf (" %s", _("Where"));
#endif
- putchar ('\n');
+ PUTCHAR ('\n');
}
/* Display UTMP_BUF, which should have N entries. */
diff --git a/src/printenv.c b/src/printenv.c
index 5ff7b2d5b..b92e60725 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -136,7 +136,7 @@ main (int argc, char **argv)
exit_status = (matches != argc - optind);
}
- if (ferror (stdout) || fclose (stdout) == EOF)
+ if (FERROR (stdout) || fclose (stdout) == EOF)
error (2, errno, _("standard output"));
exit (exit_status);
diff --git a/src/printf.c b/src/printf.c
index be7403394..892f23c5d 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -180,31 +180,31 @@ print_esc_char (int c)
switch (c)
{
case 'a': /* Alert. */
- putchar (7);
+ PUTCHAR (7);
break;
case 'b': /* Backspace. */
- putchar (8);
+ PUTCHAR (8);
break;
case 'c': /* Cancel the rest of the output. */
exit (0);
break;
case 'f': /* Form feed. */
- putchar (12);
+ PUTCHAR (12);
break;
case 'n': /* New line. */
- putchar (10);
+ PUTCHAR (10);
break;
case 'r': /* Carriage return. */
- putchar (13);
+ PUTCHAR (13);
break;
case 't': /* Horizontal tab. */
- putchar (9);
+ PUTCHAR (9);
break;
case 'v': /* Vertical tab. */
- putchar (11);
+ PUTCHAR (11);
break;
default:
- putchar (c);
+ PUTCHAR (c);
break;
}
}
@@ -229,7 +229,7 @@ print_esc (const char *escstart)
esc_value = esc_value * 16 + hextobin (*p);
if (esc_length == 0)
error (1, 0, _("missing hexadecimal number in escape"));
- putchar (esc_value);
+ PUTCHAR (esc_value);
}
else if (*p == '0')
{
@@ -237,7 +237,7 @@ print_esc (const char *escstart)
esc_length < 3 && isodigit (*p);
++esc_length, ++p)
esc_value = esc_value * 8 + octtobin (*p);
- putchar (esc_value);
+ PUTCHAR (esc_value);
}
else if (strchr ("\"\\abcfnrtv", *p))
print_esc_char (*p++);
@@ -255,7 +255,7 @@ print_esc_string (const char *str)
if (*str == '\\')
str += print_esc (str);
else
- putchar (*str);
+ PUTCHAR (*str);
}
/* Output a % directive. START is the start of the directive,
@@ -382,7 +382,7 @@ print_formatted (const char *format, int argc, char **argv)
field_width = precision = -1;
if (*f == '%')
{
- putchar ('%');
+ PUTCHAR ('%');
break;
}
if (*f == 'b')
@@ -468,7 +468,7 @@ print_formatted (const char *format, int argc, char **argv)
break;
default:
- putchar (*f);
+ PUTCHAR (*f);
}
}
diff --git a/src/spline.c b/src/spline.c
index c6296cd95..70379c31c 100644
--- a/src/spline.c
+++ b/src/spline.c
@@ -253,7 +253,7 @@ char **argv;
getdata(fdinp); /* Read data from fdinp. */
if (fdinp != stdin)
- fclose(fdinp); /* Close input data file. */
+ FCLOSE(fdinp); /* Close input data file. */
if (nknots == 0) {
error(NODATA, datafile);
}
diff --git a/src/stty.c b/src/stty.c
index ba98e4ef3..95988c5bb 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -464,12 +464,12 @@ wrapf (const char *message,...)
buflen = strlen (buf);
if (current_col + (current_col > 0) + buflen >= max_col)
{
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
}
if (current_col > 0)
{
- putchar (' ');
+ PUTCHAR (' ');
current_col++;
}
fputs (buf, stdout);
@@ -1447,7 +1447,7 @@ display_changed (struct termios *mode)
#ifdef HAVE_C_LINE
wrapf ("line = %d;", mode->c_line);
#endif
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
empty_line = 1;
@@ -1478,7 +1478,7 @@ display_changed (struct termios *mode)
(int) mode->c_cc[VTIME]);
}
else if (empty_line == 0)
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
empty_line = 1;
@@ -1490,7 +1490,7 @@ display_changed (struct termios *mode)
{
if (empty_line == 0)
{
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
empty_line = 1;
}
@@ -1514,7 +1514,7 @@ display_changed (struct termios *mode)
}
}
if (empty_line == 0)
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
}
@@ -1533,7 +1533,7 @@ display_all (struct termios *mode, int fd, const char *device_name)
#ifdef HAVE_C_LINE
wrapf ("line = %d;", mode->c_line);
#endif
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
for (i = 0; ! STREQ (control_info[i].name, "min"); ++i)
@@ -1558,7 +1558,7 @@ display_all (struct termios *mode, int fd, const char *device_name)
#endif
wrapf ("min = %d; time = %d;", mode->c_cc[VMIN], mode->c_cc[VTIME]);
if (current_col != 0)
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
for (i = 0; mode_info[i].name != NULL; ++i)
@@ -1567,7 +1567,7 @@ display_all (struct termios *mode, int fd, const char *device_name)
continue;
if (mode_info[i].type != prev_type)
{
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
prev_type = mode_info[i].type;
}
@@ -1579,7 +1579,7 @@ display_all (struct termios *mode, int fd, const char *device_name)
else if (mode_info[i].flags & REV)
wrapf ("-%s", mode_info[i].name);
}
- putchar ('\n');
+ PUTCHAR ('\n');
current_col = 0;
}
@@ -1607,7 +1607,7 @@ display_recoverable (struct termios *mode)
(unsigned long) mode->c_cflag, (unsigned long) mode->c_lflag);
for (i = 0; i < NCCS; ++i)
printf (":%x", (unsigned int) mode->c_cc[i]);
- putchar ('\n');
+ PUTCHAR ('\n');
}
static int
diff --git a/src/tty.c b/src/tty.c
index a96faead2..7a2d9deac 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -102,7 +102,7 @@ main (int argc, char **argv)
else
puts (_("not a tty"));
- if (ferror (stdout) || fclose (stdout) == EOF)
+ if (FERROR (stdout) || fclose (stdout) == EOF)
error (3, errno, _("standard output"));
}
diff --git a/src/uptime.c b/src/uptime.c
index ed0c2aa3e..2bf9a761f 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -66,7 +66,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
res = sscanf (buf, "%lf", &upsecs);
if (res == 1)
uptime = (time_t) upsecs;
- fclose (fp);
+ FCLOSE (fp);
}
#endif /* HAVE_PROC_UPTIME */
/* Loop through all the utmp entries we just read and count up the valid
@@ -122,7 +122,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
#endif
if (loads == -1)
- putchar ('\n');
+ PUTCHAR ('\n');
else
{
if (loads > 0)
@@ -132,7 +132,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
if (loads > 2)
printf (", %.2f", avg[2]);
if (loads > 0)
- putchar ('\n');
+ PUTCHAR ('\n');
}
}
diff --git a/src/users.c b/src/users.c
index a9691bc38..0d44f6dcf 100644
--- a/src/users.c
+++ b/src/users.c
@@ -82,7 +82,7 @@ list_entries_users (int n, const STRUCT_UTMP *this)
int c;
fputs (u[i], stdout);
c = (i < n_entries - 1 ? ' ' : '\n');
- putchar (c);
+ PUTCHAR (c);
}
for (i = 0; i < n_entries; i++)
diff --git a/src/who.c b/src/who.c
index 33fed28c3..519327fe4 100644
--- a/src/who.c
+++ b/src/who.c
@@ -202,7 +202,7 @@ print_entry (const STRUCT_UTMP *utmp_ent)
}
#endif
- putchar ('\n');
+ PUTCHAR ('\n');
}
/* Print the username of each valid entry and the number of valid entries
diff --git a/src/yes.c b/src/yes.c
index bd9628f01..8d0df1b36 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -70,7 +70,7 @@ main (int argc, char **argv)
for (i = 1; i < argc; i++)
{
fputs (argv[i], stdout);
- putchar (i == argc - 1 ? '\n' : ' ');
+ PUTCHAR (i == argc - 1 ? '\n' : ' ');
}
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-08-02 05:14:58 +0000