{"thread":{"id":"13364","subject":"[PATCH] Cleanup xread() loops to use read_in_full()","startedAt":"2008-05-03T13:27:26Z","lastAt":"2008-05-03T13:27:26Z","messageCount":1,"participants":["Heikki Orsila"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"75921","messageId":"20080503132726.GA15655@zakalwe.fi","threadId":"13364","inReplyTo":null,"subject":"[PATCH] Cleanup xread() loops to use read_in_full()","fromName":"Heikki Orsila","fromEmail":"heikki.orsila@iki.fi","sentAt":"2008-05-03T13:27:26Z","receivedAt":"2008-05-03T13:27:26Z","isPatch":true,"sender":{"key":"heikki.orsila@iki.fi","avatar":null},"body":"Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>\n---\n combine-diff.c |   17 ++++++++---------\n pack-write.c   |    8 ++------\n pkt-line.c     |   15 +++++----------\n sha1_file.c    |   14 ++++----------\n 4 files changed, 19 insertions(+), 35 deletions(-)\n\ndiff --git a/combine-diff.c b/combine-diff.c\nindex f1e7a4d..7420146 100644\n--- a/combine-diff.c\n+++ b/combine-diff.c\n@@ -701,7 +701,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,\n \t\telse if (0 <= (fd = open(elem->path, O_RDONLY)) &&\n \t\t\t !fstat(fd, &st)) {\n \t\t\tsize_t len = xsize_t(st.st_size);\n-\t\t\tsize_t sz = 0;\n+\t\t\tssize_t done;\n \t\t\tint is_file, i;\n \n \t\t\telem->mode = canon_mode(st.st_mode);\n@@ -716,14 +716,13 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,\n \n \t\t\tresult_size = len;\n \t\t\tresult = xmalloc(len + 1);\n-\t\t\twhile (sz < len) {\n-\t\t\t\tssize_t done = xread(fd, result+sz, len-sz);\n-\t\t\t\tif (done == 0 && sz != len)\n-\t\t\t\t\tdie(\"early EOF '%s'\", elem->path);\n-\t\t\t\telse if (done < 0)\n-\t\t\t\t\tdie(\"read error '%s'\", elem->path);\n-\t\t\t\tsz += done;\n-\t\t\t}\n+\n+\t\t\tdone = read_in_full(fd, result, len);\n+\t\t\tif (done < 0)\n+\t\t\t\tdie(\"read error '%s'\", elem->path);\n+\t\t\telse if (done < len)\n+\t\t\t\tdie(\"early EOF '%s'\", elem->path);\n+\n \t\t\tresult[len] = 0;\n \t\t}\n \t\telse {\ndiff --git a/pack-write.c b/pack-write.c\nindex 665e2b2..c66c8af 100644\n--- a/pack-write.c\n+++ b/pack-write.c\n@@ -183,7 +183,6 @@ void fixup_pack_header_footer(int pack_fd,\n \n char *index_pack_lockfile(int ip_out)\n {\n-\tint len, s;\n \tchar packname[46];\n \n \t/*\n@@ -193,11 +192,8 @@ char *index_pack_lockfile(int ip_out)\n \t * case, we need it to remove the corresponding .keep file\n \t * later on.  If we don't get that then tough luck with it.\n \t */\n-\tfor (len = 0;\n-\t\t len < 46 && (s = xread(ip_out, packname+len, 46-len)) > 0;\n-\t\t len += s);\n-\tif (len == 46 && packname[45] == '\\n' &&\n-\t\tmemcmp(packname, \"keep\\t\", 5) == 0) {\n+\tif (read_in_full(ip_out, packname, 46) == 46 && packname[45] == '\\n' &&\n+\t    memcmp(packname, \"keep\\t\", 5) == 0) {\n \t\tchar path[PATH_MAX];\n \t\tpackname[45] = 0;\n \t\tsnprintf(path, sizeof(path), \"%s/pack/pack-%s.keep\",\ndiff --git a/pkt-line.c b/pkt-line.c\nindex 355546a..f5d0086 100644\n--- a/pkt-line.c\n+++ b/pkt-line.c\n@@ -65,16 +65,11 @@ void packet_write(int fd, const char *fmt, ...)\n \n static void safe_read(int fd, void *buffer, unsigned size)\n {\n-\tsize_t n = 0;\n-\n-\twhile (n < size) {\n-\t\tssize_t ret = xread(fd, (char *) buffer + n, size - n);\n-\t\tif (ret < 0)\n-\t\t\tdie(\"read error (%s)\", strerror(errno));\n-\t\tif (!ret)\n-\t\t\tdie(\"The remote end hung up unexpectedly\");\n-\t\tn += ret;\n-\t}\n+\tssize_t ret = read_in_full(fd, buffer, size);\n+\tif (ret < 0)\n+\t\tdie(\"read error (%s)\", strerror(errno));\n+\telse if (ret < size)\n+\t\tdie(\"The remote end hung up unexpectedly\");\n }\n \n int packet_read_line(int fd, char *buffer, unsigned size)\ndiff --git a/sha1_file.c b/sha1_file.c\nindex c2ab7ea..3516777 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -2466,16 +2466,10 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, int write\n \n int read_pack_header(int fd, struct pack_header *header)\n {\n-\tchar *c = (char*)header;\n-\tssize_t remaining = sizeof(struct pack_header);\n-\tdo {\n-\t\tssize_t r = xread(fd, c, remaining);\n-\t\tif (r <= 0)\n-\t\t\t/* \"eof before pack header was fully read\" */\n-\t\t\treturn PH_ERROR_EOF;\n-\t\tremaining -= r;\n-\t\tc += r;\n-\t} while (remaining > 0);\n+\tif (read_in_full(fd, header, sizeof(*header)) < sizeof(*header))\n+\t\t/* \"eof before pack header was fully read\" */\n+\t\treturn PH_ERROR_EOF;\n+\n \tif (header->hdr_signature != htonl(PACK_SIGNATURE))\n \t\t/* \"protocol error (pack signature mismatch detected)\" */\n \t\treturn PH_ERROR_PACK_SIGNATURE;\n-- \n1.5.4.4\n"}]}