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

1 files changed, 107 insertions, 107 deletions

diff --git a/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c b/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c
index b86e725604..2385572123 100644
--- a/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c
+++ b/contrib/restricted/aws/s2n/stuffer/s2n_stuffer_file.c
@@ -1,107 +1,107 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "error/s2n_errno.h"
-
-#include "stuffer/s2n_stuffer.h"
-
-#include "utils/s2n_safety.h"
-
-int s2n_stuffer_recv_from_fd(struct s2n_stuffer *stuffer, const int rfd, const uint32_t len, uint32_t *bytes_written)
-{
-    PRECONDITION_POSIX(s2n_stuffer_validate(stuffer));
-    /* Make sure we have enough space to write */
-    GUARD(s2n_stuffer_skip_write(stuffer, len));
-
-    /* "undo" the skip write */
-    stuffer->write_cursor -= len;
-
-    ssize_t r = 0;
-    do {
-        r = read(rfd, stuffer->blob.data + stuffer->write_cursor, len);
-        S2N_ERROR_IF(r < 0 && errno != EINTR, S2N_ERR_READ);
-    } while (r < 0);
-
-    /* Record just how many bytes we have written */
-    S2N_ERROR_IF(r > UINT32_MAX, S2N_ERR_INTEGER_OVERFLOW);
-    GUARD(s2n_stuffer_skip_write(stuffer, (uint32_t)r));
-    if (bytes_written != NULL) *bytes_written = r;
-    return S2N_SUCCESS;
-}
-
-int s2n_stuffer_send_to_fd(struct s2n_stuffer *stuffer, const int wfd, const uint32_t len, uint32_t *bytes_sent)
-{
-    PRECONDITION_POSIX(s2n_stuffer_validate(stuffer));
-
-    /* Make sure we even have the data */
-    GUARD(s2n_stuffer_skip_read(stuffer, len));
-
-    /* "undo" the skip read */
-    stuffer->read_cursor -= len;
-
-    ssize_t w = 0;
-    do {
-        w = write(wfd, stuffer->blob.data + stuffer->read_cursor, len);
-        S2N_ERROR_IF(w < 0 && errno != EINTR, S2N_ERR_WRITE);
-    } while (w < 0);
-
-    S2N_ERROR_IF(w > UINT32_MAX - stuffer->read_cursor, S2N_ERR_INTEGER_OVERFLOW);
-    stuffer->read_cursor += w;
-    if (bytes_sent != NULL) *bytes_sent = w;
-    return S2N_SUCCESS;
-}
-
-int s2n_stuffer_alloc_ro_from_fd(struct s2n_stuffer *stuffer, int rfd)
-{
-    ENSURE_POSIX_MUT(stuffer);
-    struct stat st = {0};
-
-    ENSURE_POSIX(fstat(rfd, &st) >= 0, S2N_ERR_FSTAT);
-
-    ENSURE_POSIX(st.st_size > 0, S2N_FAILURE);
-    ENSURE_POSIX(st.st_size <= UINT32_MAX, S2N_FAILURE);
-
-    uint8_t *map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, rfd, 0);
-    ENSURE_POSIX(map != MAP_FAILED, S2N_ERR_MMAP);
-
-    struct s2n_blob b = {0};
-    ENSURE_POSIX(s2n_blob_init(&b, map, (uint32_t)st.st_size), S2N_FAILURE);
-    return s2n_stuffer_init(stuffer, &b);
-}
-
-int s2n_stuffer_alloc_ro_from_file(struct s2n_stuffer *stuffer, const char *file)
-{
-    ENSURE_POSIX_MUT(stuffer);
-    notnull_check(file);
-    int fd;
-
-    do {
-        fd = open(file, O_RDONLY);
-        ENSURE_POSIX(fd >= 0 || errno == EINTR, S2N_ERR_OPEN);
-    } while (fd < 0);
-
-    int r = s2n_stuffer_alloc_ro_from_fd(stuffer, fd);
-
-    GUARD(close(fd));
-
-    return r;
-}
+/* 
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"). 
+ * You may not use this file except in compliance with the License. 
+ * A copy of the License is located at 
+ * 
+ *  http://aws.amazon.com/apache2.0 
+ * 
+ * or in the "license" file accompanying this file. This file is distributed 
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
+ * express or implied. See the License for the specific language governing 
+ * permissions and limitations under the License. 
+ */ 
+ 
+#include <sys/types.h> 
+#include <sys/stat.h> 
+#include <sys/mman.h> 
+#include <unistd.h> 
+#include <errno.h> 
+#include <fcntl.h> 
+ 
+#include "error/s2n_errno.h" 
+ 
+#include "stuffer/s2n_stuffer.h" 
+ 
+#include "utils/s2n_safety.h" 
+ 
+int s2n_stuffer_recv_from_fd(struct s2n_stuffer *stuffer, const int rfd, const uint32_t len, uint32_t *bytes_written) 
+{ 
+    PRECONDITION_POSIX(s2n_stuffer_validate(stuffer)); 
+    /* Make sure we have enough space to write */ 
+    GUARD(s2n_stuffer_skip_write(stuffer, len)); 
+ 
+    /* "undo" the skip write */ 
+    stuffer->write_cursor -= len; 
+ 
+    ssize_t r = 0; 
+    do { 
+        r = read(rfd, stuffer->blob.data + stuffer->write_cursor, len); 
+        S2N_ERROR_IF(r < 0 && errno != EINTR, S2N_ERR_READ); 
+    } while (r < 0); 
+ 
+    /* Record just how many bytes we have written */ 
+    S2N_ERROR_IF(r > UINT32_MAX, S2N_ERR_INTEGER_OVERFLOW); 
+    GUARD(s2n_stuffer_skip_write(stuffer, (uint32_t)r)); 
+    if (bytes_written != NULL) *bytes_written = r; 
+    return S2N_SUCCESS; 
+} 
+ 
+int s2n_stuffer_send_to_fd(struct s2n_stuffer *stuffer, const int wfd, const uint32_t len, uint32_t *bytes_sent) 
+{ 
+    PRECONDITION_POSIX(s2n_stuffer_validate(stuffer)); 
+ 
+    /* Make sure we even have the data */ 
+    GUARD(s2n_stuffer_skip_read(stuffer, len)); 
+ 
+    /* "undo" the skip read */ 
+    stuffer->read_cursor -= len; 
+ 
+    ssize_t w = 0; 
+    do { 
+        w = write(wfd, stuffer->blob.data + stuffer->read_cursor, len); 
+        S2N_ERROR_IF(w < 0 && errno != EINTR, S2N_ERR_WRITE); 
+    } while (w < 0); 
+ 
+    S2N_ERROR_IF(w > UINT32_MAX - stuffer->read_cursor, S2N_ERR_INTEGER_OVERFLOW); 
+    stuffer->read_cursor += w; 
+    if (bytes_sent != NULL) *bytes_sent = w; 
+    return S2N_SUCCESS; 
+} 
+ 
+int s2n_stuffer_alloc_ro_from_fd(struct s2n_stuffer *stuffer, int rfd) 
+{ 
+    ENSURE_POSIX_MUT(stuffer); 
+    struct stat st = {0}; 
+ 
+    ENSURE_POSIX(fstat(rfd, &st) >= 0, S2N_ERR_FSTAT); 
+ 
+    ENSURE_POSIX(st.st_size > 0, S2N_FAILURE); 
+    ENSURE_POSIX(st.st_size <= UINT32_MAX, S2N_FAILURE); 
+ 
+    uint8_t *map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, rfd, 0); 
+    ENSURE_POSIX(map != MAP_FAILED, S2N_ERR_MMAP); 
+ 
+    struct s2n_blob b = {0}; 
+    ENSURE_POSIX(s2n_blob_init(&b, map, (uint32_t)st.st_size), S2N_FAILURE); 
+    return s2n_stuffer_init(stuffer, &b); 
+} 
+ 
+int s2n_stuffer_alloc_ro_from_file(struct s2n_stuffer *stuffer, const char *file) 
+{ 
+    ENSURE_POSIX_MUT(stuffer); 
+    notnull_check(file); 
+    int fd; 
+ 
+    do { 
+        fd = open(file, O_RDONLY); 
+        ENSURE_POSIX(fd >= 0 || errno == EINTR, S2N_ERR_OPEN); 
+    } while (fd < 0); 
+ 
+    int r = s2n_stuffer_alloc_ro_from_fd(stuffer, fd); 
+ 
+    GUARD(close(fd)); 
+ 
+    return r; 
+}