summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2007-11-11 21:17:57 +0100
committerTobias Klauser <tklauser@xenon.tklauser.home>2007-11-11 21:17:57 +0100
commita4d7f34d0210344d2e25e5af1c2e61057422521d (patch)
treeec7dcec92fcee2bce373ce5bcc5c4be3704c3b4a
parent21cddfba5f53ed0ad9d8f14bc1555c57cad9790e (diff)
Revert "inotail.c: Decrement n_units before calling tail_pipe_from_begin"pipe
This reverts commit 21cddfba5f53ed0ad9d8f14bc1555c57cad9790e. Makes inotail -n +0 work again. Sometimes reducing code leads to unrecognised errors ;-)
-rw-r--r--inotail.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/inotail.c b/inotail.c
index 2eef622..483306e 100644
--- a/inotail.c
+++ b/inotail.c
@@ -244,6 +244,9 @@ static int tail_pipe_from_begin(struct file_struct *f, unsigned long n_units, co
int bytes_read = 0;
char buf[BUFSIZ];
+ if (n_units)
+ n_units--;
+
while (n_units > 0) {
if ((bytes_read = read(f->fd, buf, BUFSIZ)) <= 0) {
if (bytes_read < 0 && (errno == EINTR || errno == EAGAIN))
@@ -292,7 +295,7 @@ static int tail_pipe_lines(struct file_struct *f, unsigned long n_lines)
const char *p;
if (from_begin)
- return tail_pipe_from_begin(f, n_lines - 1, M_LINES);
+ return tail_pipe_from_begin(f, n_lines, M_LINES);
if (n_lines == 0)
return 0;
@@ -400,7 +403,7 @@ static int tail_pipe_bytes(struct file_struct *f, unsigned long n_bytes)
unsigned long i = 0; /* Index into buffer */
if (from_begin)
- return tail_pipe_from_begin(f, n_bytes - 1, M_BYTES);
+ return tail_pipe_from_begin(f, n_bytes, M_BYTES);
/* XXX: Needed? */
if (n_bytes == 0)
dth: 19.0%;'/> -rw-r--r--drivers/misc/sgi-xp/xpnet.c21
-rw-r--r--drivers/net/fddi/skfp/skfddi.c1
-rw-r--r--drivers/net/fjes/fjes_main.c2
-rw-r--r--drivers/net/hippi/rrunner.c1
-rw-r--r--drivers/net/rionet.c15
-rw-r--r--drivers/net/slip/slip.c11
-rw-r--r--drivers/usb/gadget/function/f_phonet.c11
-rw-r--r--drivers/usb/gadget/function/u_ether.c14
-rw-r--r--include/linux/fddidevice.h1
-rw-r--r--include/linux/hippidevice.h1
-rw-r--r--net/802/fddi.c11
-rw-r--r--net/802/hippi.c14
-rw-r--r--net/batman-adv/soft-interface.c13
-rw-r--r--net/hsr/hsr_device.c1
-rw-r--r--net/phonet/pep-gprs.c12
23 files changed, 46 insertions, 154 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.criver core: convert platform_{get,set}_drvdata to static inline functions
Marc Kleine-Budde1-2/+9
2010-10-22driver core: platform_bus: allow runtime override of dev_pm_opsKevin Hilman1-0/+3
2010-08-05Driver core: reduce duplicated code for platform_device creationUwe Kleine-K├Ânig1-4/+58