ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ul.c: magic constant removal 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-04-30 13:06:22 +02:00 committed by Karel Zak
parent a3b761801c
commit cc319747b5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
text-utils/ul.c
View File

@ -63,7 +63,7 @@ static int put1wc(int c) /* Output an ASCII character as a wide character */
else else
return c; return c;
} }
#define putwp(s) tputs(s,1,put1wc) #define putwp(s) tputs(s, STDOUT_FILENO, put1wc)
#else #else
#define putwp(s) putp(s) #define putwp(s) putp(s)
#endif #endif
@ -97,7 +97,6 @@ static void print_out(char *line);
#define SUBSC 004 /* Dim | Ul */ #define SUBSC 004 /* Dim | Ul */
#define UNDERL 010 /* Ul */ #define UNDERL 010 /* Ul */
#define BOLD 020 /* Bold */ #define BOLD 020 /* Bold */
#define INITBUF 512
int must_use_uc, must_overstrike; int must_use_uc, must_overstrike;
char *CURS_UP, *CURS_RIGHT, *CURS_LEFT, char *CURS_UP, *CURS_RIGHT, *CURS_LEFT,
@ -157,7 +156,7 @@ int main(int argc, char **argv)
signal(SIGTERM, sig_handler); signal(SIGTERM, sig_handler);
termtype = getenv("TERM"); termtype = getenv("TERM");
if (termtype == NULL || (argv[0][0] == 'c' && !isatty(1))) if (termtype == NULL || (argv[0][0] == 'c' && !isatty(STDOUT_FILENO)))
termtype = "lpr"; termtype = "lpr";
while ((c = getopt_long(argc, argv, "it:T:Vh", longopts, NULL)) != -1) while ((c = getopt_long(argc, argv, "it:T:Vh", longopts, NULL)) != -1)
switch(c) { switch(c) {
@ -179,7 +178,7 @@ int main(int argc, char **argv)
usage(stderr); usage(stderr);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
setupterm(termtype, 1, &ret); setupterm(termtype, STDOUT_FILENO, &ret);
switch(ret) { switch(ret) {
case 1: case 1:
@ -191,7 +190,7 @@ int main(int argc, char **argv)
case 0: case 0:
/* No such terminal type - assume dumb */ /* No such terminal type - assume dumb */
setupterm("dumb", 1, (int *)0); setupterm("dumb", STDOUT_FILENO, (int *)0);
break; break;
} }
initinfo(); initinfo();
@ -388,7 +387,7 @@ void overstrike(void)
#ifdef __GNUC__ #ifdef __GNUC__
register wchar_t *lbuf = __builtin_alloca((maxcol+1)*sizeof(wchar_t)); register wchar_t *lbuf = __builtin_alloca((maxcol+1)*sizeof(wchar_t));
#else #else
wchar_t lbuf[256]; wchar_t lbuf[BUFSIZ];
#endif #endif
register wchar_t *cp = lbuf; register wchar_t *cp = lbuf;
int hadbold=0; int hadbold=0;
@ -431,7 +430,7 @@ void iattr(void)
#ifdef __GNUC__ #ifdef __GNUC__
register char *lbuf = __builtin_alloca((maxcol+1)*sizeof(char)); register char *lbuf = __builtin_alloca((maxcol+1)*sizeof(char));
#else #else
char lbuf[256]; char lbuf[BUFSIZ];
#endif #endif
register char *cp = lbuf; register char *cp = lbuf;
@ -455,7 +454,7 @@ void iattr(void)
void initbuf(void) void initbuf(void)
{ {
if (obuf == NULL) { /* First time. */ if (obuf == NULL) { /* First time. */
obuflen = INITBUF; obuflen = BUFSIZ;
obuf = xmalloc(sizeof(struct CHAR) * obuflen); obuf = xmalloc(sizeof(struct CHAR) * obuflen);
} }