Wrong checks on return values of write and pread syscalls

Author: Atoptool

atop.c

@@ -314,7 +314,7 @@ int		linelen  = 80;
 char		acctreason;	/* accounting not active (return val) 	*/
 char		rawname[RAWNAMESZ];
 char		rawreadflag;
-unsigned int	begintime, endtime;
+time_t		begintime, endtime;
 char		flaglist[MAXFL];
 char		deviatonly = 1;
 char      	usecolors  = 1;  /* boolean: colors for high occupation  */
@@ -551,12 +551,12 @@ main(int argc, char *argv[])
 				break;
 
                            case 'b':		/* begin time ?               */
-				if ( !hhmm2secs(optarg, &begintime) )
+				if ( !branchtime2secs(optarg, &begintime) )
 					prusage(argv[0]);
 				break;
 
                            case 'e':		/* end   time ?               */
-				if ( !hhmm2secs(optarg, &endtime) )
+				if ( !branchtime2secs(optarg, &endtime) )
 					prusage(argv[0]);
 				break;
 

atop.h

@@ -82,7 +82,7 @@ extern char		threadview;
 extern char		calcpss;
 extern char		rawname[];
 extern char		rawreadflag;
-extern unsigned int	begintime, endtime;
+extern time_t		begintime, endtime;
 extern char		flaglist[];
 extern struct visualize vis;
 
@@ -137,7 +137,7 @@ void		generic_usage(void);
 int		atopsar(int, char *[]);
 char   		*convtime(time_t, char *);
 char   		*convdate(time_t, char *);
-int   		hhmm2secs(char *, unsigned int *);
+int   		branchtime2secs(char *, time_t *);
 int		daysecs(time_t);
 
 char   		*val2valstr(count_t, char *, int, int, int);

atopacctd.c

@@ -306,7 +306,8 @@ main(int argc, char *argv[])
 	umask(022);
 
 	liResult = chdir("/tmp");			// go to a safe place
-	if( liResult != 0 )
+
+	if(liResult != 0)
 	{
 		char lcMessage[64];
 
@@ -1005,7 +1006,8 @@ setcurrent(long curshadow)
 	** wipe currency file and write new assembled string
 	*/
 	liResult = ftruncate(cfd, 0);
-	if( liResult != 0 )
+
+	if(liResult != 0)
 	{
 		char lcMessage[64];
 
@@ -1016,8 +1018,10 @@ setcurrent(long curshadow)
 	}
 
 	(void) lseek(cfd, 0, SEEK_SET);
+
 	liResult = write(cfd, currentdata, len);
-	if( liResult != 0 )
+
+	if(liResult == -1)
 	{
 		char lcMessage[64];
 

atopsar.c

@@ -154,14 +154,14 @@ atopsar(int argc, char *argv[])
 				break;
 
                            case 'b':		/* begin time ?          */
-				if ( !hhmm2secs(optarg, &begintime) )
+				if ( !branchtime2secs(optarg, &begintime) )
 					pratopsaruse(argv[0]);
 
 				saved_begintime = begintime;
 				break;
 
                            case 'e':		/* end   time ?          */
-				if ( !hhmm2secs(optarg, &endtime) )
+				if ( !branchtime2secs(optarg, &endtime) )
 					pratopsaruse(argv[0]);
 				break;
 

rawlog.c

@@ -663,7 +663,7 @@ rawread(void)
 						char *buf = malloc(READAHEADSIZE);
 						ptrverify(buf, "Malloc failed for readahead");
 						liResult = pread(rawfd, buf, READAHEADSIZE, next_pos & ~(READAHEADSIZE - 1));
-						if(liResult != 0)
+						if(liResult == -1)
 						{
 							char lcMessage[64];
 

showgeneric.c

@@ -350,7 +350,7 @@ generic_samp(time_t curtime, int nsecs,
 	register int	i, curline, statline, nproc;
 	int		firstproc = 0, plistsz, alistsz, killpid, killsig;
 	int		lastchar;
-	char		format1[16], format2[16], hhmm[16];
+	char		format1[16], format2[16], branchtime[32];
 	char		*statmsg = NULL, statbuf[80], genline[80];
 	char		 *lastsortp, curorder, autoorder;
 	char		buf[33];
@@ -1120,13 +1120,15 @@ generic_samp(time_t curtime, int nsecs,
                                 echo();
                                 move(statline, 0);
                                 clrtoeol();
-                                printw("Enter new time (format hh:mm): ");
+                                printw("Enter new time "
+				       "(format hh:mm): ");
+				// TODO:       "(format [[YYYY]MMDD/]hh:mm): ");
 
-                                hhmm[0] = '\0';
-                                scanw("%15s\n", hhmm);
+                                branchtime[0] = '\0';
+                                scanw("%31s\n", branchtime);
                                 noecho();
 
-                                if ( !hhmm2secs(hhmm, &begintime) )
+                                if ( !branchtime2secs(branchtime, &begintime) )
                                 {
                                         move(statline, 0);
                                         clrtoeol();

various.c

@@ -153,13 +153,15 @@ convdate(time_t utime, char *chardat)
 
 
 /*
-** Convert a hh:mm string into a number of seconds since 00:00
+** TODO: Convert a string in format [[YYYY]MMDD/]hh[:]mm into an epoch time value
+** TODO: When only the value hh[:]mm was given, take this time from midnight
+** Convert a string in format hh:mm number of seconds since midnight.
 **
 ** Return-value:	0 - Wrong input-format
 **			1 - Success
 */
 int
-hhmm2secs(char *itim, unsigned int *otim)
+branchtime2secs(char *itim, time_t *otim)
 {
 	register int	i;
 	int		hours, minutes;