crtxcr
/
cgitsb
1
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

cache.c: fix error checking in print_slot() 

The change to print_slot() in cdc6b2f8e7 made
the function return correct errno for read errors while ignoring write errors,
which is not what was intended. This patch tries to rectify things.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-05-20 17:56:47 +02:00
父節點 af2e75616d
當前提交 dd7c172542
共有 1 個文件被更改，包括 7 次插入 和 4 次删除
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cache.c
查看文件

@ -81,16 +81,19 @@ static int close_slot(struct cache_slot *slot)
/* Print the content of the active cache slot (but skip the key). */ /* Print the content of the active cache slot (but skip the key). */
static int print_slot(struct cache_slot *slot) static int print_slot(struct cache_slot *slot)
{ {
ssize_t i; ssize_t i, j;
i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET); i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);
if (i != slot->keylen + 1) if (i != slot->keylen + 1)
return errno; return errno;
while((i = xread(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0) do {
i = xwrite(STDOUT_FILENO, slot->buf, i); i = j = xread(slot->cache_fd, slot->buf, sizeof(slot->buf));
if (i > 0)
j = xwrite(STDOUT_FILENO, slot->buf, i);
} while (i > 0 && j == i);
if (i < 0) if (i < 0 || j != i)
return errno; return errno;
else else
return 0; return 0;