Ticket #10435: 10435.patch

headers/private/storage/mime/DatabaseLocation.h

@@ -38 +38 @@
             // opening type nodes
 
             status_t            OpenType(const char* type, BNode& _node) const;
-            status_t            OpenOrCreateType(const char* type,
-                                    BNode& _node, bool* _didCreate = NULL)
-                                    const;
+            status_t            OpenWritableType(const char* type,
+                                    BNode& _node, bool create,
+                                    bool* _didCreate = NULL) const;
 
             // generic type attributes access
 

src/kits/storage/mime/Database.cpp

@@ -126 +126 @@
         else {
             bool didCreate = false;
             BNode node;
-            err = fLocation->OpenOrCreateType(type, node, &didCreate);
+            err = fLocation->OpenWritableType(type, node, true, &didCreate);
             if (!err && didCreate) {
                 fInstalledTypes.AddType(type);
                 _SendInstallNotification(type);
@@ -443 +443 @@
     BNode node;
     bool didCreate = false;
 
-    status_t err = fLocation->OpenOrCreateType(type, node, &didCreate);
+    status_t err = fLocation->OpenWritableType(type, node, true, &didCreate);
     if (err != B_OK)
         return err;
 
@@ -504 +504 @@
     BNode node;
     bool didCreate = false;
 
-    status_t err = fLocation->OpenOrCreateType(type, node, &didCreate);
+    status_t err = fLocation->OpenWritableType(type, node, true, &didCreate);
     if (err != B_OK)
         return err;
 

src/kits/storage/mime/DatabaseLocation.cpp

@@ -69 +69 @@
 
 
 /*! \brief Opens a BNode on the given type, creating a node of the
-        appropriate flavor if necessary.
+        appropriate flavor if requested (and necessary).
     All MIME types are converted to lowercase for use in the filesystem.
     \param type The MIME type to open.
     \param _node Node opened on the given MIME type.
     \param _didCreate If not \c NULL, the variable the pointer refers to is
-        set to \c true, if the node has been newly create, to \c false
+        set to \c true, if the node has been newly created, to \c false
         otherwise.
 */
 status_t
-DatabaseLocation::OpenOrCreateType(const char* type, BNode& _node,
+DatabaseLocation::OpenWritableType(const char* type, BNode& _node, bool create,
     bool* _didCreate) const
 {
     if (_didCreate)
@@ -90 +90 @@
     if (error == B_OK) {
         if (index == 0)
             return B_OK;
+        else if (!create)
+            return B_ENTRY_NOT_FOUND;
 
         // The caller wants a editable node, but the node found is not in the
         // user's settings directory. Copy the node.
@@ -106 +108 @@
         if (_didCreate != NULL)
             *_didCreate = true;
         return error;
-    }
+    } else if (!create)
+        return B_ENTRY_NOT_FOUND;
 
     // type doesn't exist yet -- create the respective node
     error = _CreateTypeNode(type, _node);
@@ -256 +259 @@
         return B_BAD_VALUE;
 
     BNode node;
-    status_t error = OpenOrCreateType(type, node, _didCreate);
+    status_t error = OpenWritableType(type, node, true, _didCreate);
     if (error != B_OK)
         return error;
 
@@ -312 +315 @@
         return B_BAD_VALUE;
 
     BNode node;
-    int32 index;
-    status_t error = _OpenType(type, node, index);
+    status_t error = OpenWritableType(type, node, false);
     if (error != B_OK)
         return error;
 
-    if (index != 0)
-        return B_NOT_ALLOWED;
-
     return node.RemoveAttr(attribute);
 }
 
@@ -327 +326 @@
 /*! \brief Fetches the application hint for the given MIME type.
 
     The entry_ref pointed to by \c ref must be pre-allocated.
-
+
     \param type The MIME type of interest
     \param _ref Reference to a pre-allocated \c entry_ref struct into
                which the location of the hint application is copied.
@@ -418 +417 @@
 /*! The string pointed to by \c description must be long enough to
     hold the long description; a length of \c B_MIME_TYPE_LENGTH is
     recommended.
-
+
     \param type The MIME type of interest
     \param description Pointer to a pre-allocated string into which the long
         description is copied. If the function fails, the contents of the string
@@ -465 +464 @@
         _extensions.what = 234; // Don't know why, but that's what R5 does.
         err = _extensions.AddString("type", type);
     }
-    return err;
+    return err;
 }
 
 
@@ -524 +523 @@
     \return
     - \c B_OK: Success
     - \c B_ENTRY_NOT_FOUND: No icon of the given size exists for the given type
-    - "error code": Failure
+    - "error code": Failure
 
 */
 status_t
@@ -562 +561 @@
         largeIconAttrName, which, &_icon);
 
 //  ssize_t err = type && icon ? B_OK : B_BAD_VALUE;
-//
+//
 //  // Figure out what kind of data we *should* find
 //  uint32 attrType = 0;
 //  ssize_t attrSize = 0;
@@ -586 +585 @@
 //      }
 //  }
 //  // Construct our attribute name
-//  std::string attr;
+//  std::string attr;
 //  if (fileType) {
 //      attr = (which == B_MINI_ICON
 //                ? kMiniIconAttrPrefix
@@ -602 +601 @@
 //  }
 //
 //  BNode node;
-//  if (!err)
+//  if (!err)
 //      err = open_type(type, &node);
 //
 //  attr_info info;
-//  if (!err)
+//  if (!err)
 //      err = node.GetAttrInfo(attr.c_str(), &info);
 //
 //  if (!err)
@@ -620 +619 @@
 //          buffer = new(std::nothrow) char[attrSize];
 //          if (!buffer)
 //              err = B_NO_MEMORY;
-//          if (!err)
-//              err = node.ReadAttr(attr.c_str(), attrType, 0, buffer, attrSize);
+//          if (!err)
+//              err = node.ReadAttr(attr.c_str(), attrType, 0, buffer, attrSize);
 //      } else {
 //          // same color space, just read direct
 //          err = node.ReadAttr(attr.c_str(), attrType, 0, icon->Bits(), attrSize);
@@ -775 +774 @@
         err = B_OK;
     }
     if (err == B_OK) {
-        _types.what = 0;
+        _types.what = 0;
         err = _types.AddString("type", type);
     }
     return err;

src/kits/storage/mime/MimeInfoUpdater.cpp

@@ -131 +131 @@
     BAppFileInfo appFileInfoWrite;
     if (!err && updateAppInfo && node.IsFile()
         && is_shared_object_mime_type(type)
-        && file.SetTo(&entry, B_READ_WRITE) == B_OK
-        && appFileInfoRead.SetTo(&file) == B_OK
-        && appFileInfoWrite.SetTo(&file) == B_OK) {
+        && (err = file.SetTo(&entry, B_READ_WRITE)) == B_OK
+        && (err = appFileInfoRead.SetTo(&file)) == B_OK
+        && (err = appFileInfoWrite.SetTo(&file)) == B_OK) {
 
         // we read from resources and write to attributes
         appFileInfoRead.SetInfoLocation(B_USE_RESOURCES);