Changeset 515 for branches/client-2.0/src/smbwrp.c

Timestamp:

Jan 10, 2011, 1:31:33 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.0: sigpipe crash, cosmetic and text

File:

• branches/client-2.0/src/smbwrp.c (modified) (26 diffs)

branches/client-2.0/src/smbwrp.c

@@ -178 +178 @@
         }
 */
+        /*
+         * Block SIGPIPE (from lib/util_sock.c: write())
+         * It is not needed and should not stop execution
+         */
+        BlockSignals(True, SIGPIPE);
+
         return 0;
 
@@ -574 +580 @@
         if (!cli || !file || !*file->fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         if (file->denymode < DENY_ALL || file->denymode > DENY_NONE) 
@@ -611 +617 @@
         if (!cli || !file || !buf || !result) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         
@@ -637 +643 @@
         if (!cli || !file || !buf || !result) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         
@@ -661 +667 @@
         if (!cli || !file) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -728 +734 @@
         if (!cli || !file) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -764 +770 @@
         if (!cli || !oldname || !newname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -785 +791 @@
         if (!cli || !finfo || !*finfo->fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -804 +810 @@
         if (!cli || !fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 #if 0
@@ -835 +841 @@
         if (!cli || !file) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -844 +850 @@
                 if (offset < 0)
                 {
-                        return EINVAL;
+                        return maperror(EINVAL);
                 }
                 file->offset = offset;
@@ -854 +860 @@
                 if (offset > 0)
                 {
-                        return EINVAL;
+                        return maperror(EINVAL);
                 }
                 if (!cli_qfileinfo3(cli, file->fd, 
@@ -866 +872 @@
                 file->offset = size + offset;
                 break;
-        default: return EINVAL;
+        default: return maperror(EINVAL);
         }
 
@@ -881 +887 @@
         if (!cli || !finfo || !*finfo->fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         debuglocal(4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
@@ -927 +933 @@
                 if (rc == EINVAL)
                 {
-                        rc = ENOTDIR;
+                        rc = maperror(ENOTDIR);
                 }
                 return rc;
@@ -953 +959 @@
         if (!cli || !file || !finfo) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -1460 +1466 @@
         if (!srv || !cli || !state || !*state->mask)
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         debuglocal(1,"Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev);
@@ -1530 +1536 @@
         if (!cli || !fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -1540 +1546 @@
 
         if (!(finfo.attr & aDIR)) {
-                return ENOTDIR;
+                return maperror(ENOTDIR);
         }
 
@@ -1554 +1560 @@
         if (!cli || !fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -1571 +1577 @@
         if (!cli || !fname) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -1588 +1594 @@
         if (!cli || !fname || !name) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         if (!cli_set_ea_path(cli, fname, name, value, size)) 
@@ -1604 +1610 @@
         if (!cli || !file || !name) 
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
         if (!cli_set_ea_fnum(cli, file->fd, name, value, size)) 
@@ -1703 +1709 @@
         if (!cli || !fname || !buffer)
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -1717 +1723 @@
         if (!cli || !file || !buffer)
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }
 
@@ -1733 +1739 @@
         if (!cli || !pfsa)
         {
-                return EINVAL;
+                return maperror(EINVAL);
         }