Changeset 42

Timestamp:

Jun 5, 2006, 12:44:29 AM (18 years ago)

Author:

rainer

Message:

Bugfix for regression that makes local updates impossible for clients

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_getopt.c (modified) (5 diffs)
• src/sh_unix.c (modified) (2 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.2.1:
+        * fix a regression that would make impossible local updates w/clients
+        * fix a few missing '\n' in sh_getopt.c
         * sh_kern.c: fall back on mmap() if read() fails on /dev/kmem
         * fix Solaris package creation

trunk/src/sh_getopt.c

@@ -521 +521 @@
                                   0 != (* op_table[i].func )(argv[1]))
                                 fprintf (stderr, 
-                                         _("Error processing option -%c"),
+                                         _("Error processing option -%c\n"),
                                          op_table[i].shortopt);
                               break;
@@ -531 +531 @@
                               0 != (* op_table[i].func )(NULL))
                             fprintf (stderr, 
-                                     _("Error processing option -%c"),
+                                     _("Error processing option -%c\n"),
                                      op_table[i].shortopt);
                           break;
@@ -586 +586 @@
                                   0 != (* op_table[i].func )(argv[1]))
                                 fprintf (stderr, 
-                                         _("Error processing option -%s"),
+                                         _("Error processing option -%s\n"),
                                          op_table[i].longopt);
                               break;
@@ -600 +600 @@
                                   0 != (* op_table[i].func )(theequal))
                                 fprintf (stderr, 
-                                         _("Error processing option -%s"),
+                                         _("Error processing option -%s\n"),
                                          op_table[i].longopt);
                               break;
@@ -617 +617 @@
                           0 != (* op_table[i].func )(NULL))
                         fprintf (stderr, 
-                                 _("Error processing option -%s"),
+                                 _("Error processing option -%s\n"),
                                  op_table[i].longopt);
                       break;

trunk/src/sh_unix.c

@@ -3686 +3686 @@
 {
   static int init = 0;
+  struct stat buf;
 
   SL_ENTER(_("file_is_remote"));
@@ -3696 +3697 @@
   if (0 == sl_strncmp (sh.data.path, preq, 15))
     {
+      if (sh.data.path[15] != '\0') /* should be start of path */
+        {
+          if (0 == stat(&(sh.data.path[15]), &buf))
+            {
+              SL_RETURN( S_FALSE, _("file_is_remote"));
+            }
+        }
       SL_RETURN( S_TRUE, _("file_is_remote"));
     }