From 4967eb8fc0b7cfc6427a1e3ced22cd874146e9af Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 7 Nov 2006 21:08:17 +0000
Subject: [PATCH] cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3936 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
src/files.c | 16 ++++++++--------
src/prompt.c | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 32fa82f5..1faf5732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
CVS code -
+- General:
+ - Miscellaneous comment fixes. (DLR)
GNU nano 2.0.0 - 2006.11.06
- General:
diff --git a/src/files.c b/src/files.c
index 99f862e7..6aec143c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -959,8 +959,8 @@ char *get_full_path(const char *origpath)
/* If stat()ing d_there fails, assume that d_there refers to a new
* file that hasn't been saved to disk yet. Set path_only to TRUE
* if d_there refers to a directory, and FALSE otherwise. */
- path_only = stat(d_there, &fileinfo) == 0 &&
- S_ISDIR(fileinfo.st_mode);
+ path_only = (stat(d_there, &fileinfo) != -1 &&
+ S_ISDIR(fileinfo.st_mode));
/* If path_only is TRUE, make sure d_there ends in a slash. */
if (path_only) {
@@ -1145,10 +1145,10 @@ void init_operating_dir(void)
* so that tab completion will work. */
bool check_operating_dir(const char *currpath, bool allow_tabcomp)
{
- /* The char *full_operating_dir is global for mem cleanup. It
- * should have already been initialized by init_operating_dir().
- * Also, a relative operating directory path will only be handled
- * properly if this is done. */
+ /* full_operating_dir is global for memory cleanup. It should have
+ * already been initialized by init_operating_dir(). Also, a
+ * relative operating directory path will only be handled properly
+ * if this is done. */
char *fullpath;
bool retval = FALSE;
@@ -1873,7 +1873,7 @@ int do_writeout(bool exiting)
openfile->filename) != 0) {
struct stat st;
- if (!stat(answer, &st)) {
+ if (stat(answer, &st) != -1) {
i = do_yesno_prompt(FALSE,
_("File exists, OVERWRITE ? "));
if (i == 0 || i == -1)
@@ -1904,7 +1904,7 @@ int do_writeout(bool exiting)
if (!ISSET(RESTRICTED) && !exiting && openfile->mark_set)
retval = write_marked_file(answer, NULL, FALSE, append);
else
-#endif /* !NANO_TINY */
+#endif
retval = write_file(answer, NULL, FALSE, append, FALSE);
break;
diff --git a/src/prompt.c b/src/prompt.c
index da9b5895..bacf1956 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -999,7 +999,7 @@ int get_prompt_string(bool allow_tabs,
wnoutrefresh(bottomwin);
/* If we're using restricted mode, we aren't allowed to change the
- * name of a file once it has one because that would allow writing
+ * name of a file once it has one, because that would allow writing
* to files not specified on the command line. In this case,
* disable all keys that would change the text if the filename isn't
* blank and we're at the "Write File" prompt. */
--
GitLab