Changeset 49a8434

Timestamp:

Dec 6, 2008, 6:55:29 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

b9cb41b

Parents:

7ce4003

git-author:

Nelson Elhage <nelhage@mit.edu> (12/06/08 18:52:42)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/06/08 18:55:29)

Message:

Fix three small warnings.

Files:

• functions.c (modified) (2 diffs)
• popexec.c (modified) (1 diff)
• wcwidth.c (modified) (1 diff)

functions.c

@@ -1954 +1954 @@
 void owl_function_status()
 {
-  char buff[5000];
+  char buff[MAXPATHLEN+1];
   time_t start;
   int up, days, hours, minutes;
@@ -1974 +1974 @@
 
   owl_fmtext_append_normal(&fm, "  Current Directory: ");
-  (void) getcwd(buff, MAXPATHLEN);
-  owl_fmtext_append_normal(&fm, buff);
+  if(getcwd(buff, MAXPATHLEN) == NULL) {
+    owl_fmtext_append_normal(&fm, "<Error in getcwd>");
+  } else {
+    owl_fmtext_append_normal(&fm, buff);
+  }
   owl_fmtext_append_normal(&fm, "\n");
 

popexec.c

@@ -73 +73 @@
     dup2(child_write_fd, 2 /*stderr*/);
     close(child_write_fd);
-    
-    while(0) {
-      write(child_write_fd, "meep\n", 5);
-      sleep(1);
-    }
 
     argv[0] = "sh";

wcwidth.c

@@ -62 +62 @@
 #include <wchar.h>
 
-static struct interval {
+struct interval {               /* noproto */
   int first;
   int last;