aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-02-05 11:58:03 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-02-05 11:58:03 +0000
commit32087595f702848519db3c9c8c77716e78f95aca (patch)
tree7e928f62859e837363ee2d161f9e6b3946c2f161
parent[w3m-dev 02989] (diff)
downloadw3m-32087595f702848519db3c9c8c77716e78f95aca.tar.gz
w3m-32087595f702848519db3c9c8c77716e78f95aca.zip
[w3m-dev 02990]
* file.c (doFileCopy): use Strfgets() instead of fgets() * file.c (doFileSave): ditto From: Fumitoshi UKAI <ukai@debian.or.jp>
-rw-r--r--ChangeLog8
-rw-r--r--file.c18
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ebb0ae8..1b1ee17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-02-05 Fumitoshi UKAI <ukai@debian.or.jp>
+ * [w3m-dev 02990]
+ * file.c (doFileCopy): use Strfgets() instead of fgets()
+ * file.c (doFileSave): ditto
+
+2002-02-05 Fumitoshi UKAI <ukai@debian.or.jp>
+
* [w3m-dev 02989]
* file.c (inputAnswer): use Strfgets() instead of fgets()
@@ -2799,4 +2805,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.300 2002/02/05 03:45:33 ukai Exp $
+$Id: ChangeLog,v 1.301 2002/02/05 11:58:03 ukai Exp $
diff --git a/file.c b/file.c
index b926d57..53b9c4a 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.64 2002/02/05 03:45:33 ukai Exp $ */
+/* $Id: file.c,v 1.65 2002/02/05 11:58:04 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -6818,7 +6818,7 @@ void
doFileCopy(char *tmpf, char *defstr)
{
Str msg;
- char filen[256];
+ Str filen;
char *p, *q;
if (fmInitialized) {
@@ -6850,10 +6850,10 @@ doFileCopy(char *tmpf, char *defstr)
if (q == NULL || *q == '\0') {
printf("(Download)Save file to: ");
fflush(stdout);
- p = fgets(filen, sizeof(filen), stdin);
- if (p == NULL || filen[0] == '\0')
+ filen = Strfgets(stdin);
+ if (filen->length == 0)
return;
- q = filen;
+ q = filen->ptr;
}
for (p = q + strlen(q) - 1; IS_SPACE(*p); p--) ;
*(p + 1) = '\0';
@@ -6886,7 +6886,7 @@ void
doFileSave(URLFile uf, char *defstr)
{
Str msg;
- char filen[256];
+ Str filen;
char *p, *q;
if (fmInitialized) {
@@ -6915,10 +6915,10 @@ doFileSave(URLFile uf, char *defstr)
if (q == NULL || *q == '\0') {
printf("(Download)Save file to: ");
fflush(stdout);
- p = fgets(filen, sizeof(filen), stdin);
- if (p == NULL || filen[0] == '\0')
+ filen = Strfgets(stdin);
+ if (filen->length == 0)
return;
- q = filen;
+ q = filen->ptr;
}
for (p = q + strlen(q) - 1; IS_SPACE(*p); p--) ;
*(p + 1) = '\0';