bindletools: refactoring -n option in encoding widgets

1 files changed, 9 insertions, 14 deletions

diff --git a/src/widget-encodings.c b/src/widget-encodings.c
index f4600f2..c06a694 100644
--- a/src/widget-encodings.c
+++ b/src/widget-encodings.c
@@ -180,6 +180,7 @@ bindle_widget_encodings(
          int                           method )
 {
    int               c;
+   int               rc;
    int               opt_index;
    const char *      str;
 
@@ -288,8 +289,14 @@ bindle_widget_encodings(
    fflush(stdout);
 
    if ((str))
-      return(bindle_widget_encodings_string(cnf, method, str));
-   return(bindle_widget_encodings_stdin(cnf, method));
+      rc = bindle_widget_encodings_string(cnf, method, str);
+   else
+      rc = bindle_widget_encodings_stdin(cnf, method);
+
+   if ((cnf->widget_flags & BINDLE_FLG_NEWLINE))
+      write(bindle_fdout, "\n", strlen("\n"));
+
+   return(rc);
 }
 
 
@@ -319,12 +326,6 @@ bindle_widget_encodings_stdin(
       return(1);
    };
 
-   if ((cnf->widget_flags & BINDLE_FLG_NEWLINE))
-   {
-      bindle_strlcpy(res, "\n", sizeof(res));
-      write(bindle_fdout, res, strlen(res));
-   };
-
    return(0);
 }
 
@@ -365,12 +366,6 @@ bindle_widget_encodings_string(
       };
    };
 
-   if ((cnf->widget_flags & BINDLE_FLG_NEWLINE))
-   {
-      bindle_strlcpy(res, "\n", sizeof(res));
-      write(bindle_fdout, res, strlen(res));
-   };
-
    return(0);
 }