Commit 2b6a2c76 authored by Andrew Price's avatar Andrew Price
Browse files

Use SEEK_* in lseek(2) calls 

Change scripted with coccinelle:

@rule0@
expression A,B;
@@
- lseek(A, B, 0);
+ lseek(A, B, SEEK_SET);
@rule1@
expression A,B;
@@
- lseek(A, B, 1);
+ lseek(A, B, SEEK_CUR);
@rule2@
expression A,B;
@@
- lseek(A, B, 2);
+ lseek(A, B, SEEK_END);
parent 152e0a0c

src/client/add.c

+6 −6
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int add_msg(int folnum, struct user *user, int replyto) 
			free(new);

			return(-1);

		}else

			lseek(headfile,posn,0);

			lseek(headfile, posn, SEEK_SET);

		while (get_data(headfile,&inreplyto) && inreplyto.Ref<replyto);

		if (inreplyto.Ref!=replyto)

		{
@@ -372,7 +372,7 @@ int add_msg(int folnum, struct user *user, int replyto) 
				return(0);

			}

			size=lseek(tfile,0,2);

			lseek(tfile,0,0);

			lseek(tfile, 0, SEEK_SET);

			buff=(char *)realloc(buff,size);

			read(tfile,buff,size);

			new->size=size;
@@ -398,9 +398,9 @@ int add_msg(int folnum, struct user *user, int replyto) 
	Lock_File(data);



	new->datafield=lseek(data,0l,2);

	lseek(folderfile,folnum*sizeof(struct folder),0);

	lseek(folderfile, folnum * sizeof(struct folder), SEEK_SET);

	read(folderfile,fol,sizeof(*fol));

	lseek(folderfile,-1*sizeof(struct folder),1);

	lseek(folderfile, -1 * sizeof(struct folder), SEEK_CUR);

	if (!is_moderated(fol,user))

	{

		new->Ref=fol->last+1;
@@ -408,7 +408,7 @@ int add_msg(int folnum, struct user *user, int replyto) 
		if (fol->first==0) fol->first=1;

		if (replyto>0)

		{

			lseek(i,replyposn,0);

			lseek(i, replyposn, SEEK_SET);

			write(i,&inreplyto,sizeof(inreplyto));

		}

	}else
@@ -421,7 +421,7 @@ int add_msg(int folnum, struct user *user, int replyto) 


	if (td>0){

		printf(_("Warning: Index error, skipping back %ld bytes.\r\n"),td);

		lseek(i,-td,1);

		lseek(i, -td, SEEK_CUR);

	}

	if ((write(i,new,sizeof(*new)))<sizeof(*new))

	{

src/client/edit.c

+5 −5
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static void users_lastread(int folnum) 
	Lock_File(ufile);

	while (read(ufile,&usr,sizeof(usr))>0)

	{

		lseek(ufile,-1*sizeof(usr),1);

		lseek(ufile, -1 * sizeof(usr), SEEK_CUR);

		usr.lastread[folnum]=0;

		usr.folders[0]|=(1<<folnum);

		write(ufile,&usr,sizeof(usr));
@@ -763,7 +763,7 @@ void edit_folder(const char *args, const char *name) 


	afile=openfolderfile(O_RDWR);

	Lock_File(afile);

	lseek(afile,folnum*sizeof(struct folder),0);

	lseek(afile, folnum * sizeof(struct folder), SEEK_SET);

	write(afile,&fold,sizeof(struct folder));

	Unlock_File(afile);

	close(afile);
@@ -793,7 +793,7 @@ void mesg_edit(const char *args, struct folder *folder, int msgno, struct user * 
		return;

	}

	buff=(char *)malloc(head.size);

	lseek(text,head.datafield,0);

	lseek(text, head.datafield, SEEK_SET);

	read(text,buff,head.size);



	if (!u_god(usr)	&& !u_mod(usr) && strcasecmp(head.from, usr->record.name))
@@ -866,7 +866,7 @@ void mesg_edit(const char *args, struct folder *folder, int msgno, struct user * 
			return;

		}

		size=lseek(tfile,0,2);

		lseek(tfile,0,0);

		lseek(tfile, 0, SEEK_SET);

		buff=(char *)realloc(buff,size);

		read(tfile,buff,size);

		head.size=size;
@@ -933,7 +933,7 @@ void mesg_edit(const char *args, struct folder *folder, int msgno, struct user * 
	else

		printf(_("What do you want to do ?\n"));

	Lock_File(fd);

	lseek(fd,-1*sizeof(head),1);

	lseek(fd, -1 * sizeof(head), SEEK_CUR);

	write(fd,&head,sizeof(head));

	Unlock_File(fd);

	close(fd);

src/client/mod.c

+3 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void moderate(void) 
		{

			int foo;

			text=(char *)malloc(head.size);

			lseek(tmptext,head.datafield,0);

			lseek(tmptext, head.datafield, SEEK_SET);

			if ((foo=read(tmptext,text,head.size))<head.size)

			{

				printf(_("only %d of %d bytes read.\n"),foo,head.size);
@@ -127,7 +127,8 @@ void moderate(void) 
			if (stringcmp(answer,_("approve"),1))

			{

				Lock_File(f_file);

				lseek(f_file,-1*sizeof(struct folder),1);

				lseek(f_file, -1 * sizeof(struct folder),

				      SEEK_CUR);

				fold.last++;

				if (fold.first<=0) fold.first=1;

				write(f_file,&fold,sizeof(fold));

src/client/new.c

+3 −3
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ static int read_new(struct user *user, struct folder *data, int folnum) 
	}

	/* try jumping to expected location */

	posn = (urec->lastread[folnum] - data->first + 1) * sizeof(struct Header);

	lseek(indexfile, posn, 0);

	lseek(indexfile, posn, SEEK_SET);

	/* read the article, if failed, or overshot then rewind to start */

	if (!get_data(indexfile, &head) || head.Ref > urec->lastread[folnum]) {

		lseek(indexfile,0,0);

		lseek(indexfile, 0, SEEK_SET);

		get_data(indexfile,&head);

	}
@@ -151,7 +151,7 @@ static int read_new(struct user *user, struct folder *data, int folnum) 
				long foo;

				foo=lseek(indexfile,0,1);

				add_msg(folnum, user, head.Ref);

				lseek(indexfile,foo,0);

				lseek(indexfile, foo, SEEK_SET);

				get_folder_number(data,folnum);

			}else

			if (stringcmp(tmp,"unsubscribe",5))

src/client/newmain.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ void c_tidyup(CommandList *cm, int argc, const char **argv, char *args) 
		{

			first=idx.Ref<first?idx.Ref:first;

			textbuff=(char *)malloc(idx.size+1);

			lseek(textin,idx.datafield,0);

			lseek(textin, idx.datafield, SEEK_SET);

			read(textin,textbuff,idx.size);

			idx.datafield=lseek(textout,0,1);

			write(textout,textbuff,idx.size);