All platforms use a line-buffered stdout

Remove manual buffer flushing and setting of the buffer on stdout.
Drop NOLINEBUF configuration point.

Author: LegalizeAdulthood

HACKERSGUIDE.txt

@@ -60,8 +60,6 @@ SYSTEM DEPENDENCIES AS DETERMINED BY THE CONFIGURE SCRIPT.
 * Don't use %d anywhere that someone might need a %ld.  (Just because YOU
     typedefed it as an int doesn't mean someone else won't need a long.)
 * Don't use %D, that's archaic.
-* Put FLUSHes after printf()s, fputs()es and putchar('\n')s for our poor
-    brethern and sistern without line buffering.
 * Declare the type of every function.  Use void, even if your C compiler
     doesn't.
 * Follow the style that trn already uses!  This is my pet peeve.  Well, one

config/cmake/config.h.in

@@ -15,12 +15,6 @@
 #cmakedefine HAS_NEWS_ADMIN
 #define NEWS_ADMIN "@NEWS_ADMIN@"
 
-/* NOLINEBUF:
- *      This symbol, if defined, indicates that stdout is not buffered, so that
- *      the program can call setbuf() or setlinebuf() for efficiency.
- */
-#cmakedefine NOLINEBUF
-
 /* NORMSIG:
  *      This symbol, if defined, indicates that normal signal handling routines
  *      should be used, as opposed to the ones in 4.1bsd (sigset, etc.).

config/common.h

@@ -699,17 +699,4 @@ extern const char *g_cantopen;
 extern const char *g_cantcreate;
 extern const char *g_nocd;
 
-#ifdef NOLINEBUF
-#define FLUSH ,fflush(stdout)
-#else
-#define FLUSH
-#endif
-
-#ifdef lint
-#undef FLUSH
-#define FLUSH
-#undef putchar
-#define putchar(c)
-#endif
-
 #endif

libtrn/addng.cpp

@@ -145,7 +145,7 @@ static void new_nntp_groups(DATASRC *dp)
             break;
 #ifdef DEBUG
         if (debug & DEB_NNTP)
-            printf("<%s\n", g_ser_line) FLUSH;
+            printf("<%s\n", g_ser_line);
 #endif
         if (nntp_at_list_end(g_ser_line))
             break;
@@ -201,7 +201,7 @@ static void new_local_groups(DATASRC *dp)
 
     FILE *fp = fopen(dp->extra_name, "r");
     if (fp == nullptr) {
-        printf(g_cantopen,dp->extra_name) FLUSH;
+        printf(g_cantopen, dp->extra_name);
         termdown(1);
         return;
     }

libtrn/art.cpp

@@ -723,7 +723,7 @@ page_switch_result page_switch()
         if (s != nullptr)
         {
                             /* compile regular expression */
-            printf("\n%s\n",s) FLUSH;
+            printf("\n%s\n", s);
             termdown(2);
             return PS_ASK;
         }
@@ -740,8 +740,7 @@ page_switch_result page_switch()
             g_gline = g_tc_LINES-2;
 #ifdef DEBUG
         if (debug & DEB_INNERSRCH) {
-            printf("Start here? %d  >=? %d\n",g_topline + g_gline + 1,g_artline)
-              FLUSH;
+            printf("Start here? %d  >=? %d\n",g_topline + g_gline + 1,g_artline);
             termdown(1);
         }
 #endif
@@ -767,7 +766,7 @@ page_switch_result page_switch()
             }
 #ifdef DEBUG
             if (debug & DEB_INNERSRCH)
-                printf("Test %s\n",s) FLUSH;
+                printf("Test %s\n",s);
 #endif
             success = execute(&s_gcompex,s) != nullptr;
             if (nlptr)
@@ -779,14 +778,13 @@ page_switch_result page_switch()
         }
         if (!g_innersearch) {
             seekartbuf(g_artpos);
-            fputs("(Not found)",stdout) FLUSH;
+            fputs("(Not found)", stdout);
             g_term_col = 11;
             return PS_ASK;
         }
 #ifdef DEBUG
         if (debug & DEB_INNERSRCH) {
-            printf("On page? %ld <=? %ld\n",(long)g_innersearch,(long)g_artpos)
-              FLUSH;
+            printf("On page? %ld <=? %ld\n",(long)g_innersearch,(long)g_artpos);
             termdown(1);
         }
 #endif
@@ -799,7 +797,7 @@ page_switch_result page_switch()
             g_highlight = g_artline - 1;
 #ifdef DEBUG
             if (debug & DEB_INNERSRCH) {
-                printf("@ %d\n",g_highlight) FLUSH;
+                printf("@ %d\n",g_highlight);
                 termdown(1);
             }
 #endif
@@ -829,7 +827,7 @@ page_switch_result page_switch()
       refresh_screen:
 #ifdef DEBUG
         if (debug & DEB_INNERSRCH) {
-            printf("Topline = %d",g_topline) FLUSH;
+            printf("Topline = %d",g_topline);
             fgets(g_buf, sizeof g_buf, stdin);
         }
 #endif
@@ -878,7 +876,7 @@ page_switch_result page_switch()
                     for (pos = g_artpos - pos; pos-- && !at_nl(*s); s++)
                         putchar(*s);
                     color_default();
-                    putchar('\n') FLUSH;
+                    putchar('\n');
                     g_topline--;
                     g_artpos = vrdary(--g_artline);
                     if (g_artpos < 0)
@@ -1061,7 +1059,7 @@ page_switch_result page_switch()
       case 'q': /* quit this article? */
         return PS_TOEND;
       default:
-        fputs(g_hforhelp,stdout) FLUSH;
+        fputs(g_hforhelp,stdout);
         termdown(1);
         settle_down();
         return PS_ASK;
@@ -1074,8 +1072,7 @@ bool innermore()
     if (g_artpos < g_innersearch) {             /* not even on page yet? */
 #ifdef DEBUG
         if (debug & DEB_INNERSRCH)
-            printf("Not on page %ld < %ld\n",(long)g_artpos,(long)g_innersearch)
-              FLUSH;
+            printf("Not on page %ld < %ld\n",(long)g_artpos,(long)g_innersearch);
 #endif
         return true;
     }
@@ -1088,7 +1085,7 @@ bool innermore()
 #ifdef DEBUG
         if (debug & DEB_INNERSRCH) {
             printf("There it is %ld = %ld, %d @ %d\n",(long)g_artpos,
-                (long)g_innersearch,g_hide_everything,g_highlight) FLUSH;
+                (long)g_innersearch,g_hide_everything,g_highlight);
             termdown(1);
         }
 #endif
@@ -1101,8 +1098,7 @@ bool innermore()
     }
 #ifdef DEBUG
     if (debug & DEB_INNERSRCH) {
-        printf("Not far enough? %d <? %d + %d\n",g_artline,s_isrchline,g_gline)
-          FLUSH;
+        printf("Not far enough? %d <? %d + %d\n",g_artline,s_isrchline,g_gline);
         termdown(1);
     }
 #endif

libtrn/artsrch.cpp

@@ -207,9 +207,9 @@ art_search_result art_search(char *patbuf, int patbufsiz, bool get_cmd)
             }
             if (g_verbose) {
                 if (cmdchr != '+' && cmdchr != '.')
-                    printf("\nMarking %s \"%s\" as read.\n",finding_str,h) FLUSH;
+                    printf("\nMarking %s \"%s\" as read.\n",finding_str,h);
                 else
-                    printf("\nSelecting %s \"%s\".\n",finding_str,h) FLUSH;
+                    printf("\nSelecting %s \"%s\".\n",finding_str,h);
                 termdown(2);
             }
         }
@@ -224,7 +224,7 @@ art_search_result art_search(char *patbuf, int patbufsiz, bool get_cmd)
         }
 #ifdef DEBUG
         if (debug) {
-            printf("\npattern = %s\n",pattern) FLUSH;
+            printf("\npattern = %s\n",pattern);
             termdown(2);
         }
 #endif
@@ -286,7 +286,7 @@ art_search_result art_search(char *patbuf, int patbufsiz, bool get_cmd)
         if (g_use_threads)
             newline();
         else {
-            fputs("\nSearching...\n",stdout) FLUSH;
+            fputs("\nSearching...\n",stdout);
             termdown(2);
         }
                                         /* give them something to read */
@@ -368,7 +368,7 @@ static bool wanted(COMPEX *compex, ART_NUM artnum, art_scope scope)
         strncpy(g_buf+9,fetchsubj(artnum,false),256);
 #ifdef DEBUG
         if (debug & DEB_SEARCH_AHEAD)
-            printf("%s\n",g_buf) FLUSH;
+            printf("%s\n",g_buf);
 #endif
         break;
       case ARTSCOPE_FROM:

libtrn/autosub.cpp

@@ -56,7 +56,7 @@ static bool matchlist(const char *patlist, const char *s)
         const char *err = ng_comp(&ilcompex, pattern.c_str(), true, true);
 
         if (err != nullptr) {
-            printf("\n%s\n", err) FLUSH;
+            printf("\n%s\n", err);
             finalize(1);
         }
 

libtrn/backpage.cpp

@@ -24,7 +24,7 @@ void backpage_init()
     s_varyfd = open(varyname,2);
     remove(varyname);
     if (s_varyfd < 0) {
-        printf(g_cantopen,varyname) FLUSH;
+        printf(g_cantopen,varyname);
         sig_catcher(0);
     }
 
@@ -39,7 +39,7 @@ ART_POS vrdary(ART_LINE indx)
 
 #ifdef DEBUG
     if (indx > maxindx) {
-        printf("vrdary(%ld) > %ld\n",(long)indx, (long)maxindx) FLUSH;
+        printf("vrdary(%ld) > %ld\n",(long)indx, (long)maxindx);
         return 0;
     }
 #endif
@@ -71,12 +71,12 @@ void vwtary(ART_LINE indx, ART_POS newvalue)
 
 #ifdef DEBUG
     if (indx < 0)
-        printf("vwtary(%ld)\n",(long)indx) FLUSH;
+        printf("vwtary(%ld)\n",(long)indx);
     if (!indx)
         maxindx = 0;
     if (indx > maxindx) {
         if (indx != maxindx + 1)
-            printf("indx skipped %d-%d\n",maxindx+1,indx-1) FLUSH;
+            printf("indx skipped %d-%d\n",maxindx+1,indx-1);
         maxindx = indx;
     }
 #endif

libtrn/bits.cpp

@@ -76,11 +76,11 @@ void rc_to_bits()
     unread = 0;
 #ifdef DEBUG
     if (debug & DEB_CTLAREA_BITMAP) {
-        printf("\n%s\n",mybuf) FLUSH;
+        printf("\n%s\n",mybuf);
         termdown(2);
         for (i = article_first(g_absfirst); i < g_firstart; i = article_next(i)) {
             if (article_unread(i))
-                printf("%ld ",(long)i) FLUSH;
+                printf("%ld ",(long)i);
         }
     }
 #endif
@@ -118,11 +118,11 @@ void rc_to_bits()
             article_ptr(i)->flags &= ~AF_UNREAD;
 #ifdef DEBUG
         if (debug & DEB_CTLAREA_BITMAP) {
-            printf("\n%s\n",s) FLUSH;
+            printf("\n%s\n",s);
             termdown(2);
             for (i = g_absfirst; i <= g_lastart; i++) {
                 if (!was_read(i))
-                    printf("%ld ",(long)i) FLUSH;
+                    printf("%ld ",(long)i);
             }
         }
 #endif
@@ -143,7 +143,7 @@ void rc_to_bits()
     }
 #ifdef DEBUG
     if (debug & DEB_CTLAREA_BITMAP) {
-        fputs("\n(hit CR)",stdout) FLUSH;
+        fputs("\n(hit CR)",stdout);
         termdown(1);
         fgets(g_cmd_buf, sizeof g_cmd_buf, stdin);
     }
@@ -225,8 +225,8 @@ void bits_to_rc()
     *s++ = '\0';                        /* and terminate string */
 #ifdef DEBUG
     if ((debug & DEB_NEWSRC_LINE) && !g_panic) {
-        printf("%s: %s\n",g_ngptr->rcline,g_ngptr->rcline+g_ngptr->numoffset) FLUSH;
-        printf("%s\n",mybuf) FLUSH;
+        printf("%s: %s\n",g_ngptr->rcline,g_ngptr->rcline+g_ngptr->numoffset);
+        printf("%s\n",mybuf);
         termdown(2);
     }
 #endif
@@ -506,7 +506,7 @@ void yankback()
                 plural(g_dmcount));
         else {
             printf("\nReturning %ld Marked article%s...\n",(long)g_dmcount,
-                plural(g_dmcount)) FLUSH;
+                plural(g_dmcount));
             termdown(2);
         }
         article_walk(yank_article, 0);
@@ -596,7 +596,7 @@ static int chase_xref(ART_NUM artnum, int markread)
     xref_buf = savestr(xref_buf);
 # ifdef DEBUG
     if (debug & DEB_XREF_MARKER) {
-        printf("Xref: %s\n",xref_buf) FLUSH;
+        printf("Xref: %s\n",xref_buf);
         termdown(1);
     }
 # endif
@@ -688,7 +688,7 @@ static bool valid_xref_site(ART_NUM artnum, char *site)
 
 #ifdef DEBUG
     if (debug) {
-        printf("Xref not from %s -- ignoring\n",inews_site) FLUSH;
+        printf("Xref not from %s -- ignoring\n",inews_site);
         termdown(1);
     }
 #endif

libtrn/cache.cpp

@@ -662,7 +662,7 @@ void look_ahead()
         if (s != nullptr)
         {
                                     /* compile regular expression */
-            printf("\n%s\n",s) FLUSH;
+            printf("\n%s\n",s);
             termdown(2);
             g_srchahead = 0;
         }