Changeset f36222f

Timestamp:

Dec 6, 2003, 9:13:39 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

88ca489

Parents:

a68f05d

Message:

Do ~ expansion in 'dump' command.

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (1 diff)
• functions.c (modified) (3 diffs)
• util.c (modified) (2 diffs)

ChangeLog

@@ -8 +8 @@
         Command line arg -D turns on debugging and deletes previous
           debugging file
+        Do ~ expansion in 'dump' command.
         
 2.0.13

commands.c

@@ -1083 +1083 @@
 char *owl_command_dump(int argc, char **argv, char *buff)
 {
+  char *filename;
+  
   if (argc!=2) {
     owl_function_makemsg("usage: dump <filename>");
     return(NULL);
   }
-
-  owl_function_dump(argv[1]);
+  filename=owl_util_makepath(argv[1]);
+  owl_function_dump(filename);
+  owl_free(filename);
   return(NULL);
 }

functions.c

@@ -3120 +3120 @@
 }
 
+/* Dump messages in the current view to the file 'filename'. */
 void owl_function_dump(char *filename) 
 {
@@ -3126 +3127 @@
   owl_view *v;
   FILE *file;
+
   /* struct stat sbuf; */
 
@@ -3152 +3154 @@
   }
   fclose(file);
+  owl_function_makemsg("Messages dumped to %s", filename);
 }
 

util.c

@@ -4 +4 @@
 #include <unistd.h>
 #include <ctype.h>
+#include <pwd.h>
 
 static const char fileIdent[] = "$Id$";
@@ -175 +176 @@
   }
   return buff;
+}
+
+/* Return a "nice" version of the path.  Tilde expansion is done, and
+ * duplicate slashes are removed.  Caller must free the return.
+ */
+char *owl_util_makepath(char *in)
+{
+  int i, j, x;
+  char *out, user[MAXPATHLEN];
+  struct passwd *pw;
+
+  out=owl_malloc(MAXPATHLEN+1);
+  out[0]='\0';
+  j=strlen(in);
+  x=0;
+  for (i=0; i<j; i++) {
+    if (in[i]=='~') {
+      if ( (i==(j-1)) ||          /* last character */
+           (in[i+1]=='/') ) {     /* ~/ */
+        /* use my homedir */
+        pw=getpwuid(getuid());
+        if (!pw) {
+          out[x]=in[i];
+        } else {
+          out[x]='\0';
+          strcat(out, pw->pw_dir);
+          x+=strlen(pw->pw_dir);
+        }
+      } else {
+        /* another user homedir */
+        int a, b;
+        b=0;
+        for (a=i+1; i<j; a++) {
+          if (in[a]==' ' || in[a]=='/') {
+            break;
+          } else {
+            user[b]=in[a];
+            i++;
+            b++;
+          }
+        }
+        user[b]='\0';
+        pw=getpwnam(user);
+        if (!pw) {
+          out[x]==in[i];
+        } else {
+          out[x]='\0';
+          strcat(out, pw->pw_dir);
+          x+=strlen(pw->pw_dir);
+        }
+      }
+    } else if (in[i]=='/') {
+      /* check for a double / */
+      if (i<(j-1) && (in[i+1]=='/')) {
+        /* do nothing */
+      } else {
+        out[x]=in[i];
+        x++;
+      }
+    } else {
+      out[x]=in[i];
+      x++;
+    }
+  }
+  out[x]='\0';
+  return(out);
 }