fixup! MDEV-36269: improve error handling for source command

Author: svoj

client/my_readline.h

@@ -37,6 +37,7 @@ typedef struct st_line_buffer
 extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
 extern char *batch_readline(LINE_BUFFER *buffer, bool binary_mode);
 extern void batch_readline_end(LINE_BUFFER *buffer);
-extern bool init_line_buffer(LINE_BUFFER *buffer, File file, ulong size, ulong max_size);
+extern bool init_line_buffer(LINE_BUFFER *buffer, File file, ulong size,
+                             ulong max_size);
 
 #endif /* CLIENT_MY_READLINE_INCLUDED */

client/mysql.cc

@@ -1218,12 +1218,14 @@ static LINE_BUFFER *batch_readline_init(ulong max_size, const char *path)
   {
     if ((file= my_open(path, O_RDONLY | O_BINARY, MYF(0))) < 0)
     {
-      #ifdef _WIN32
-        if (my_errno == EACCES && my_stat(path, &input_file_stat, MYF(0)) &&
-            MY_S_ISDIR(input_file_stat.st_mode))
-          goto errdir;
-      #endif
-      my_snprintf(buff, sizeof(buff), "Failed to open file '%.*s', error: %d", 
+#ifdef _WIN32
+      if (my_errno == EACCES)
+        goto errdir;
+      if (my_errno == EACCES && my_stat(path, &input_file_stat, MYF(0)) &&
+          MY_S_ISDIR(input_file_stat.st_mode))
+        goto errdir;
+#endif
+      my_snprintf(buff, sizeof(buff), "Failed to open file '%.*s', error: %d",
                   FN_REFLEN, path, my_errno);
       put_info(buff, INFO_ERROR, 0);
       return 0;
@@ -1236,31 +1238,31 @@ static LINE_BUFFER *batch_readline_init(ulong max_size, const char *path)
 
   if (my_fstat(file, &input_file_stat, MYF(0)))
   {
-    my_snprintf(buff, sizeof(buff), "Failed to stat file '%.*s', error: %d", 
+    my_snprintf(buff, sizeof(buff), "Failed to stat file '%.*s', error: %d",
                 FN_REFLEN, path ? path : "stdin", my_errno);
     goto err1;
   }
 
   if (MY_S_ISDIR(input_file_stat.st_mode))
   {
-    #ifdef _WIN32
-      errdir:
-    #endif
-        my_snprintf(buff, sizeof(buff), "Can't read from a directory '%.*s'", 
-                    FN_REFLEN, path ? path : "stdin");
+#ifdef _WIN32
+  errdir:
+#endif
+    my_snprintf(buff, sizeof(buff), "Can't read from a directory '%.*s'",
+                FN_REFLEN, path ? path : "stdin");
     goto err1;
   }
-  
+
 #ifndef _WIN32
   if (MY_S_ISBLK(input_file_stat.st_mode))
   {
-    my_snprintf(buff, sizeof(buff), "Can't read from a block device '%.*s'", 
+    my_snprintf(buff, sizeof(buff), "Can't read from a block device '%.*s'",
                 FN_REFLEN, path ? path : "stdin");
     goto err1;
   }
 #endif
 
-  if (!(line_buff= (LINE_BUFFER*) my_malloc(PSI_NOT_INSTRUMENTED, 
+  if (!(line_buff= (LINE_BUFFER*) my_malloc(PSI_NOT_INSTRUMENTED,
                                             sizeof(*line_buff),
                                             MYF(MY_WME | MY_ZEROFILL))))
   {
@@ -1275,12 +1277,12 @@ static LINE_BUFFER *batch_readline_init(ulong max_size, const char *path)
 
   return line_buff;
 
-  err1:
-    put_info(buff, INFO_ERROR, 0);
-  err:
-    if (path)
-      my_close(file, MYF(0));
-    return 0;
+err1:
+  put_info(buff, INFO_ERROR, 0);
+err:
+  if (path)
+    my_close(file, MYF(0));
+  return 0;
 }
 
 static int delimiter_index= -1;