Restoring authorship annotation for <deshevoy@yandex-team.ru>. Commit 2 of 2.

1 files changed, 111 insertions, 111 deletions

diff --git a/contrib/libs/curl/lib/setup-vms.h b/contrib/libs/curl/lib/setup-vms.h
index 49cd7643bc4..ba75dc295b0 100644
--- a/contrib/libs/curl/lib/setup-vms.h
+++ b/contrib/libs/curl/lib/setup-vms.h
@@ -41,7 +41,7 @@
 #   endif
 #endif
 #include <stdlib.h>
-char *decc$getenv(const char *__name); 
+char *decc$getenv(const char *__name);
 #include <pwd.h>
 
 #include <string.h>
@@ -79,24 +79,24 @@ char *decc$getenv(const char *__name);
 #   if __INITIAL_POINTER_SIZE == 32
 /* Translate the path, but only if the path is a VMS file specification */
 /* The translation is usually only needed for older versions of VMS */
-static char *vms_translate_path(const char *path) 
-{ 
-  char *unix_path; 
-  char *test_str; 
-
-  /* See if the result is in VMS format, if not, we are done */ 
-  /* Assume that this is a PATH, not just some data */ 
-  test_str = strpbrk(path, ":[<^"); 
-  if(test_str == NULL) { 
-    return (char *)path; 
-  } 
-
-  unix_path = decc$translate_vms(path); 
-
-  if((int)unix_path <= 0) { 
-    /* We can not translate it, so return the original string */ 
-    return (char *)path; 
-  } 
+static char *vms_translate_path(const char *path)
+{
+  char *unix_path;
+  char *test_str;
+
+  /* See if the result is in VMS format, if not, we are done */
+  /* Assume that this is a PATH, not just some data */
+  test_str = strpbrk(path, ":[<^");
+  if(test_str == NULL) {
+    return (char *)path;
+  }
+
+  unix_path = decc$translate_vms(path);
+
+  if((int)unix_path <= 0) {
+    /* We can not translate it, so return the original string */
+    return (char *)path;
+  }
 }
 #   else
     /* VMS translate path is actually not needed on the current 64 bit */
@@ -112,74 +112,74 @@ static char *vms_translate_path(const char *path)
 #   endif
 #endif
 
-static char *vms_getenv(const char *envvar) 
-{ 
-  char *result; 
-  char *vms_path; 
+static char *vms_getenv(const char *envvar)
+{
+  char *result;
+  char *vms_path;
 
-  /* first use the DECC getenv() function */ 
-  result = decc$getenv(envvar); 
-  if(result == NULL) { 
-    return result; 
-  } 
+  /* first use the DECC getenv() function */
+  result = decc$getenv(envvar);
+  if(result == NULL) {
+    return result;
+  }
 
-  vms_path = result; 
-  result = vms_translate_path(vms_path); 
+  vms_path = result;
+  result = vms_translate_path(vms_path);
 
-  /* note that if you backport this to use VAX C RTL, that the VAX C RTL */ 
-  /* may do a malloc(2048) for each call to getenv(), so you will need   */ 
-  /* to add a free(vms_path) */ 
-  /* Do not do a free() for DEC C RTL builds, which should be used for */ 
-  /* VMS 5.5-2 and later, even if using GCC */ 
+  /* note that if you backport this to use VAX C RTL, that the VAX C RTL */
+  /* may do a malloc(2048) for each call to getenv(), so you will need   */
+  /* to add a free(vms_path) */
+  /* Do not do a free() for DEC C RTL builds, which should be used for */
+  /* VMS 5.5-2 and later, even if using GCC */
 
-  return result; 
+  return result;
 }
 
 
 static struct passwd vms_passwd_cache;
 
 static struct passwd *vms_getpwuid(uid_t uid)
-{ 
+{
   struct passwd *my_passwd;
 
 /* Hack needed to support 64 bit builds, decc_getpwnam is 32 bit only */
 #ifdef __DECC
 #   if __INITIAL_POINTER_SIZE
-  __char_ptr32 unix_path; 
+  __char_ptr32 unix_path;
 #   else
-  char *unix_path; 
+  char *unix_path;
 #   endif
 #else
-  char *unix_path; 
+  char *unix_path;
 #endif
 
-  my_passwd = decc_getpwuid(uid); 
-  if(my_passwd == NULL) { 
-    return my_passwd; 
-  } 
-
-  unix_path = vms_translate_path(my_passwd->pw_dir); 
-
-  if((long)unix_path <= 0) { 
-    /* We can not translate it, so return the original string */ 
-    return my_passwd; 
-  } 
-
-  /* If no changes needed just return it */ 
-  if(unix_path == my_passwd->pw_dir) { 
-    return my_passwd; 
-  } 
-
-  /* Need to copy the structure returned */ 
-  /* Since curl is only using pw_dir, no need to fix up */ 
-  /* the pw_shell when running under Bash */ 
-  vms_passwd_cache.pw_name = my_passwd->pw_name; 
-  vms_passwd_cache.pw_uid = my_passwd->pw_uid; 
-  vms_passwd_cache.pw_gid = my_passwd->pw_uid; 
-  vms_passwd_cache.pw_dir = unix_path; 
-  vms_passwd_cache.pw_shell = my_passwd->pw_shell; 
-
-  return &vms_passwd_cache; 
+  my_passwd = decc_getpwuid(uid);
+  if(my_passwd == NULL) {
+    return my_passwd;
+  }
+
+  unix_path = vms_translate_path(my_passwd->pw_dir);
+
+  if((long)unix_path <= 0) {
+    /* We can not translate it, so return the original string */
+    return my_passwd;
+  }
+
+  /* If no changes needed just return it */
+  if(unix_path == my_passwd->pw_dir) {
+    return my_passwd;
+  }
+
+  /* Need to copy the structure returned */
+  /* Since curl is only using pw_dir, no need to fix up */
+  /* the pw_shell when running under Bash */
+  vms_passwd_cache.pw_name = my_passwd->pw_name;
+  vms_passwd_cache.pw_uid = my_passwd->pw_uid;
+  vms_passwd_cache.pw_gid = my_passwd->pw_uid;
+  vms_passwd_cache.pw_dir = unix_path;
+  vms_passwd_cache.pw_shell = my_passwd->pw_shell;
+
+  return &vms_passwd_cache;
 }
 
 #ifdef __DECC
@@ -204,19 +204,19 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define CRYPTO_cleanup_all_ex_data CRYPTO_CLEANUP_ALL_EX_DATA
 #define CRYPTO_free CRYPTO_FREE
 #define CRYPTO_malloc CRYPTO_MALLOC
-#define CONF_modules_load_file CONF_MODULES_LOAD_FILE 
-#ifdef __VAX 
-#  ifdef VMS_OLD_SSL 
-  /* Ancient OpenSSL on VAX/VMS missing this constant */ 
-#    define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10 
-#    undef CONF_modules_load_file 
-     static int CONF_modules_load_file(const char *filename, 
-                                       const char *appname, 
-                                       unsigned long flags) { 
-             return 1; 
-     } 
-#  endif 
-#endif 
+#define CONF_modules_load_file CONF_MODULES_LOAD_FILE
+#ifdef __VAX
+#  ifdef VMS_OLD_SSL
+  /* Ancient OpenSSL on VAX/VMS missing this constant */
+#    define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
+#    undef CONF_modules_load_file
+     static int CONF_modules_load_file(const char *filename,
+                                       const char *appname,
+                                       unsigned long flags) {
+             return 1;
+     }
+#  endif
+#endif
 #define DES_ecb_encrypt DES_ECB_ENCRYPT
 #define DES_set_key DES_SET_KEY
 #define DES_set_odd_parity DES_SET_ODD_PARITY
@@ -242,7 +242,7 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define EVP_PKEY_free EVP_PKEY_FREE
 #define EVP_cleanup EVP_CLEANUP
 #define GENERAL_NAMES_free GENERAL_NAMES_FREE
-#define i2d_X509_PUBKEY I2D_X509_PUBKEY 
+#define i2d_X509_PUBKEY I2D_X509_PUBKEY
 #define MD4_Final MD4_FINAL
 #define MD4_Init MD4_INIT
 #define MD4_Update MD4_UPDATE
@@ -250,9 +250,9 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define MD5_Init MD5_INIT
 #define MD5_Update MD5_UPDATE
 #define OPENSSL_add_all_algo_noconf OPENSSL_ADD_ALL_ALGO_NOCONF
-#ifndef __VAX 
-#define OPENSSL_load_builtin_modules OPENSSL_LOAD_BUILTIN_MODULES 
-#endif 
+#ifndef __VAX
+#define OPENSSL_load_builtin_modules OPENSSL_LOAD_BUILTIN_MODULES
+#endif
 #define PEM_read_X509 PEM_READ_X509
 #define PEM_write_bio_X509 PEM_WRITE_BIO_X509
 #define PKCS12_PBE_add PKCS12_PBE_ADD
@@ -276,7 +276,7 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define SSL_CTX_set_cipher_list SSL_CTX_SET_CIPHER_LIST
 #define SSL_CTX_set_def_passwd_cb_ud SSL_CTX_SET_DEF_PASSWD_CB_UD
 #define SSL_CTX_set_default_passwd_cb SSL_CTX_SET_DEFAULT_PASSWD_CB
-#define SSL_CTX_set_msg_callback SSL_CTX_SET_MSG_CALLBACK 
+#define SSL_CTX_set_msg_callback SSL_CTX_SET_MSG_CALLBACK
 #define SSL_CTX_set_verify SSL_CTX_SET_VERIFY
 #define SSL_CTX_use_PrivateKey SSL_CTX_USE_PRIVATEKEY
 #define SSL_CTX_use_PrivateKey_file SSL_CTX_USE_PRIVATEKEY_FILE
@@ -293,7 +293,7 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define SSL_get_peer_cert_chain SSL_GET_PEER_CERT_CHAIN
 #define SSL_get_peer_certificate SSL_GET_PEER_CERTIFICATE
 #define SSL_get_privatekey SSL_GET_PRIVATEKEY
-#define SSL_get_session SSL_GET_SESSION 
+#define SSL_get_session SSL_GET_SESSION
 #define SSL_get_shutdown SSL_GET_SHUTDOWN
 #define SSL_get_verify_result SSL_GET_VERIFY_RESULT
 #define SSL_library_init SSL_LIBRARY_INIT
@@ -306,32 +306,32 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define SSL_set_fd SSL_SET_FD
 #define SSL_set_session SSL_SET_SESSION
 #define SSL_shutdown SSL_SHUTDOWN
-#define SSL_version SSL_VERSION 
+#define SSL_version SSL_VERSION
 #define SSL_write SSL_WRITE
 #define SSLeay SSLEAY
 #define SSLv23_client_method SSLV23_CLIENT_METHOD
 #define SSLv3_client_method SSLV3_CLIENT_METHOD
 #define TLSv1_client_method TLSV1_CLIENT_METHOD
-#define UI_create_method UI_CREATE_METHOD 
-#define UI_destroy_method UI_DESTROY_METHOD 
-#define UI_get0_user_data UI_GET0_USER_DATA 
-#define UI_get_input_flags UI_GET_INPUT_FLAGS 
-#define UI_get_string_type UI_GET_STRING_TYPE 
-#define UI_create_method UI_CREATE_METHOD 
-#define UI_destroy_method UI_DESTROY_METHOD 
-#define UI_method_get_closer UI_METHOD_GET_CLOSER 
-#define UI_method_get_opener UI_METHOD_GET_OPENER 
-#define UI_method_get_reader UI_METHOD_GET_READER 
-#define UI_method_get_writer UI_METHOD_GET_WRITER 
-#define UI_method_set_closer UI_METHOD_SET_CLOSER 
-#define UI_method_set_opener UI_METHOD_SET_OPENER 
-#define UI_method_set_reader UI_METHOD_SET_READER 
-#define UI_method_set_writer UI_METHOD_SET_WRITER 
+#define UI_create_method UI_CREATE_METHOD
+#define UI_destroy_method UI_DESTROY_METHOD
+#define UI_get0_user_data UI_GET0_USER_DATA
+#define UI_get_input_flags UI_GET_INPUT_FLAGS
+#define UI_get_string_type UI_GET_STRING_TYPE
+#define UI_create_method UI_CREATE_METHOD
+#define UI_destroy_method UI_DESTROY_METHOD
+#define UI_method_get_closer UI_METHOD_GET_CLOSER
+#define UI_method_get_opener UI_METHOD_GET_OPENER
+#define UI_method_get_reader UI_METHOD_GET_READER
+#define UI_method_get_writer UI_METHOD_GET_WRITER
+#define UI_method_set_closer UI_METHOD_SET_CLOSER
+#define UI_method_set_opener UI_METHOD_SET_OPENER
+#define UI_method_set_reader UI_METHOD_SET_READER
+#define UI_method_set_writer UI_METHOD_SET_WRITER
 #define UI_OpenSSL UI_OPENSSL
-#define UI_set_result UI_SET_RESULT 
+#define UI_set_result UI_SET_RESULT
 #define X509V3_EXT_print X509V3_EXT_PRINT
 #define X509_EXTENSION_get_critical X509_EXTENSION_GET_CRITICAL
-#define X509_EXTENSION_get_data X509_EXTENSION_GET_DATA 
+#define X509_EXTENSION_get_data X509_EXTENSION_GET_DATA
 #define X509_EXTENSION_get_object X509_EXTENSION_GET_OBJECT
 #define X509_LOOKUP_file X509_LOOKUP_FILE
 #define X509_NAME_ENTRY_get_data X509_NAME_ENTRY_GET_DATA
@@ -356,12 +356,12 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #define sk_pop SK_POP
 #define sk_pop_free SK_POP_FREE
 #define sk_value SK_VALUE
-#ifdef __VAX 
-#define OPENSSL_NO_SHA256 
-#endif 
-#define SHA256_Final SHA256_FINAL 
-#define SHA256_Init SHA256_INIT 
-#define SHA256_Update SHA256_UPDATE 
+#ifdef __VAX
+#define OPENSSL_NO_SHA256
+#endif
+#define SHA256_Final SHA256_FINAL
+#define SHA256_Init SHA256_INIT
+#define SHA256_Update SHA256_UPDATE
 
 #define USE_UPPERCASE_GSSAPI 1
 #define gss_seal GSS_SEAL
@@ -427,7 +427,7 @@ static struct passwd *vms_getpwuid(uid_t uid)
 
         static void des_ecb_encrypt(const_des_cblock *input,
                                     des_cblock *output,
-                                    des_key_schedule ks, int enc) { 
+                                    des_key_schedule ks, int enc) {
             DES_ECB_ENCRYPT(input, output, ks, enc);
         }
 #endif