[Bug 356] sendfax -z does not like spaces

Now it likes spaces. Thanks Patrice!

diff --git a/sendfax/sendfax.c++ b/sendfax/sendfax.c++
index 516a82615acb3512729314a023e3fcb2ee9781fb..f67d94a9766f29132df91024670a1de50b2046dd 100644 (file)
--- a/sendfax/sendfax.c++
+++ b/sendfax/sendfax.c++
@@ -28,6 +28,7 @@
 #include "FaxDB.h"
 #include "Sys.h"
 #include "config.h"
+#include <ctype.h>             // isspace()
 
 #if HAS_LOCALE
 extern "C" {
@@ -307,17 +308,17 @@ void
 sendFaxApp::addDestinationsFromFile(const char* filename)
 {
     FILE* destfile;
-    char dest[ 256 ];
+    char dest[256];
+    char *cp;
 
-    if( ( destfile = fopen( filename, "r" ) ) != NULL )
-    {
-       while( fscanf( destfile, "%255s", dest ) != EOF )
-       {
-           addDestination( dest );
+    if ((destfile = fopen(filename, "r")) != NULL) {
+       while (fgets(dest, sizeof(dest), destfile)) {
+            for (cp = strchr(dest, '\0'); cp>dest && isspace(cp[-1]); cp--);
+            *cp='\0';
+           if (dest[0] != '#' && dest[0] != '\0')
+               addDestination(dest);
        }
-    }
-    else
-    {
+    } else {
        fatal("%s: no such file", filename);
     }
 }