X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgenauth.c;h=895ed7bc64969e0d67c9a3baaed7902347f81fee;hp=0d47d510422deab5cb05faa3b09d5ff3638f0518;hb=9c2ac77594d83a810c53faf6979e0b76006ecd0e;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7

diff --git a/src/genauth.c b/src/genauth.c
index 0d47d510..895ed7bc 100644
--- a/src/genauth.c
+++ b/src/genauth.c
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
   p = xmalloc(bytes);
 
   setbuf(stdout, NULL);
-  for(i = 0; i < 128; i++)
+  for(i = 0; i < bytes; i++)
     {
       c = fgetc(fp);
       if(feof(fp))
@@ -70,23 +70,24 @@ int main(int argc, char **argv)
         }
       p[i] = c;
     }
+  fclose(fp);
 
-  for(i = 0; i < (bytes); i++)
+  if(isatty(1))
     {
-      c = fgetc(fp);
-      if(feof(fp))
-	{
-	  puts("");
-	  fprintf(stderr, "File was empty!\n");
-	}
-      p[i] = c;
+      fprintf(stderr, ": done.\nThe following line should be ENTIRELY copied into a passphrase file:\n");
+      printf("%d ", bits);
+      for(i = 0; i < bytes; i++)
+	printf("%02x", p[i]);
+      puts("");
+    }
+  else
+    {
+      printf("%d ", bits);
+      for(i = 0; i < bytes; i++)
+	printf("%02x", p[i]);
+      puts("");
+      fprintf(stderr, ": done.\n");
     }
-  fclose(fp);
-
-  printf("%d ", bits);
-  for(i = 0; i < bytes; i++)
-    printf("%02x", p[i]);
-  puts("");
 
   return 0;
 }