From a3717481edc306e1211327c4f6f6bafae4357860 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 4 Mar 2018 22:53:21 +0300
Subject: [PATCH] More robust mkpath.

GitOrigin-RevId: 3c0417c3223dff7161f4457da8ae475f6dc8f925
---
 td/telegram/ReplyMarkup.cpp    |  2 +-
 tdutils/td/utils/port/path.cpp | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/td/telegram/ReplyMarkup.cpp b/td/telegram/ReplyMarkup.cpp
index 6a6bb78d..110331f2 100644
--- a/td/telegram/ReplyMarkup.cpp
+++ b/td/telegram/ReplyMarkup.cpp
@@ -437,7 +437,7 @@ Result<unique_ptr<ReplyMarkup>> get_reply_markup(tl_object_ptr<td_api::ReplyMark
             continue;
           }
 
-          TRY_RESULT(current_button, get_keyboard_button(std::move(button), request_buttons_allowed))
+          TRY_RESULT(current_button, get_keyboard_button(std::move(button), request_buttons_allowed));
 
           row_buttons.push_back(std::move(current_button));
           row_button_count++;
diff --git a/tdutils/td/utils/port/path.cpp b/tdutils/td/utils/port/path.cpp
index 9cd431cf..8b169fef 100644
--- a/tdutils/td/utils/port/path.cpp
+++ b/tdutils/td/utils/port/path.cpp
@@ -50,11 +50,19 @@ Status set_temporary_dir(CSlice dir) {
 }
 
 Status mkpath(CSlice path, int32 mode) {
+  Status first_error = Status::OK();
+  Status last_error = Status::OK();
   for (size_t i = 1; i < path.size(); i++) {
     if (path[i] == TD_DIR_SLASH) {
-      TRY_STATUS(mkdir(path.substr(0, i).str(), mode))
+      last_error = mkdir(path.substr(0, i).str(), mode);
+      if (last_error.is_error() && first_error.is_ok()) {
+        first_error = last_error.clone();
+      }
     }
   }
+  if (last_error.is_error()) {
+    return first_error;
+  }
   return Status::OK();
 }