Changeset 8639

Timestamp:

11/29/10 17:26:00 (2 years ago)

Author:

sampson

Message:

Testing command-line apps

Location:

branches/windows-client

Files:

• projects/OrangeFS/OrangeFS.sln (modified) (2 diffs)
• projects/OrangeFS/pvfs2-ls (added)
• projects/OrangeFS/pvfs2-ls/pvfs2-ls.vcxproj (added)
• src/apps/admin/pvfs2-ls.c (modified) (8 diffs)

branches/windows-client/projects/OrangeFS/OrangeFS.sln

@@ -115 +115 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "proto", "proto\proto.vcxproj", "{2F406AB6-D010-4196-A523-FAE6F2B1585F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvfs2-ls", "pvfs2-ls\pvfs2-ls.vcxproj", "{09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}"
 EndProject
 Global
@@ -272 +274 @@
                 {2F406AB6-D010-4196-A523-FAE6F2B1585F}.Release|x64.ActiveCfg = Release|x64
                 {2F406AB6-D010-4196-A523-FAE6F2B1585F}.Release|x64.Build.0 = Release|x64
+                {09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}.Debug|Win32.ActiveCfg = Debug|Win32
+                {09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}.Debug|Win32.Build.0 = Debug|Win32
+                {09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}.Debug|x64.ActiveCfg = Debug|Win32
+                {09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}.Release|Win32.ActiveCfg = Release|Win32
+                {09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}.Release|Win32.Build.0 = Release|Win32
+                {09F8C9E4-1E99-4EBB-88E6-2A2CA290D718}.Release|x64.ActiveCfg = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

branches/windows-client/src/apps/admin/pvfs2-ls.c

@@ -20 +20 @@
 #endif
 #include <assert.h>
+#ifndef WIN32
 #include <getopt.h>
+#endif
 
 #include "pvfs2.h"
@@ -224 +226 @@
     char *formatted_size = NULL;
     char *formatted_owner = NULL, *formatted_group = NULL, *formatted_time = NULL;
+#ifdef WIN32
+
+#else
     struct group *grp = NULL;
     struct passwd *pwd = NULL;
+#endif
     char *empty_str = "";
     char *owner = empty_str, *group = empty_str;
@@ -321 +327 @@
         if (!opts->list_no_owner)
         {
+#ifdef WIN32
+            owner = scratch_owner;
+#else
             pwd = getpwuid((uid_t)attr->owner);
             owner = (pwd ? pwd->pw_name : scratch_owner);
+#endif
         }
 
         if (!opts->list_no_group)
         {
+#ifdef WIN32
+            group = scratch_group;
+#else
             grp = getgrgid((gid_t)attr->group);
             group = (grp ? grp->gr_name : scratch_group);
+#endif
+
         }
     }
@@ -610 +625 @@
         for(i = 0; i < rdplus_response.pvfs_dirent_outcount; i++)
         {
+            PVFS_sys_attr *attr;
+
             cur_file = rdplus_response.dirent_array[i].d_name;
             cur_handle = rdplus_response.dirent_array[i].handle;
@@ -618 +635 @@
                     opts, entry_buffer);
 
-            PVFS_sys_attr *attr = &rdplus_response.attr_array[i];
+            attr = &rdplus_response.attr_array[i];
             if(attr->objtype == PVFS_TYPE_DIRECTORY && opts->list_recursive)
             {
@@ -713 +730 @@
  * returns pointer to options structure on success, NULL on failure
  */
+#ifdef WIN32
 static struct options* parse_args(int argc, char* argv[])
 {
@@ -718 +736 @@
     const char *cur_option = NULL;
     struct options* tmp_opts = NULL;
+
+    static char str_opts[14][16] = {
+        "help",
+        "human-readable",
+        "si",
+        "version",
+        "recursive",
+        "verbose",
+        "numeric-uid-gid",
+        "directory",
+        "no-group",
+        "almost-all",
+        "all",
+        "inode",
+        "size",
+        "all-times"
+    };
+
+    tmp_opts = (struct options*)malloc(sizeof(struct options));
+    if (!tmp_opts)
+    {
+        return(NULL);
+    }
+    memset(tmp_opts, 0, sizeof(struct options));
+    /* RVndGoAaiglt */
+    option_index = 1;
+    while ((option_index < argc) && (argv[option_index][0] == '-'))
+    {
+        cur_option = argv[option_index];
+
+        if ((strcmp(cur_option, "-?") == 0) || 
+            (strcmp(cur_option, "--help") == 0))
+        {
+            usage(argc, argv);
+            exit(0);
+        }
+        else if ((strcmp(cur_option, "--human-readable") == 0) ||
+                 (strcmp(cur_option, "-h") == 0))
+        {
+            tmp_opts->list_human_readable = 1;
+        }
+        else if (strcmp(cur_option, "--si") == 0)
+        {
+            tmp_opts->list_use_si_units = 1;
+            break;
+        }
+        else if (strcmp(cur_option, "--version") == 0)
+        {
+            printf("%s\n", PVFS2_VERSION);
+            exit(0);
+        }
+        else if ((strcmp(cur_option, "--recursive") == 0) ||
+                 (strcmp(cur_option, "-R") == 0))
+        {
+            tmp_opts->list_recursive = 1;
+        }
+        else if ((strcmp(cur_option, "--verbose") == 0) ||
+                 (strcmp(cur_option, "-V") == 0))
+        {
+            tmp_opts->list_verbose = 1;
+        }
+        else if ((strcmp(cur_option, "--numeric-uid-gid") == 0) ||
+                 (strcmp(cur_option, "-n") == 0))
+        {
+            tmp_opts->list_long = 1;
+            tmp_opts->list_numeric_uid_gid = 1;
+        }
+        else if ((strcmp(cur_option, "--directory") == 0) ||
+                 (strcmp(cur_option, "-d") == 0))
+        {
+            tmp_opts->list_directory = 1;
+        }
+        else if ((strcmp(cur_option, "--no-group") == 0) ||
+                 (strcmp(cur_option, "-G") == 0))
+        {
+            tmp_opts->list_long = 1;
+            tmp_opts->list_no_group = 1;
+        }
+        else if ((strcmp(cur_option, "--almost-all") == 0) ||
+                 (strcmp(cur_option, "-A") == 0))
+        {
+            tmp_opts->list_almost_all = 1;
+        }
+        else if ((strcmp(cur_option, "--all") == 0) ||
+                 (strcmp(cur_option, "-a") == 0))
+        {
+            tmp_opts->list_all = 1;
+        }
+        else if ((strcmp(cur_option, "--inode") == 0) ||
+                 (strcmp(cur_option, "-i") == 0))
+        {
+            tmp_opts->list_inode = 1;
+        }
+        else if ((strcmp(cur_option, "--all-times") == 0))
+        {
+            tmp_opts->list_all_times = 1;
+        }
+        else if (strcmp(cur_option, "-l") == 0)
+        {
+            tmp_opts->list_long = 1;
+        }
+        else
+        {
+            usage(argc, argv);
+            exit(EXIT_FAILURE);
+        }
+        
+        option_index++;
+    }
+
+    for(i = option_index; i < argc; i++)
+    {
+        if (tmp_opts->num_starts < MAX_NUM_PATHS)
+        {
+            tmp_opts->start[i-option_index] = argv[i];
+            tmp_opts->num_starts++;
+        }
+        else
+        {
+            fprintf(stderr,"Ignoring path %s\n",argv[i]);
+        }
+    }
+
+    return tmp_opts;
+
+}
+#else
+static struct options* parse_args(int argc, char* argv[])
+{
+    int i = 0, ret = 0, option_index = 0;
+    const char *cur_option = NULL;
+    struct options* tmp_opts = NULL;
+
     static struct option long_opts[] =
     {
@@ -884 +1035 @@
     return tmp_opts;
 }
+#endif
 
 static void usage(int argc, char** argv)