view src/protocols/zephyr/ZWait4Not.c @ 9969:cc2e6dd43613

[gaim-migrate @ 10879] (21:35:19) nosnilmot: LSchiere: gaim_blist_add_group() should not really be #if 0'd out... does that need a patch? (21:35:38) LSchiere: why is it #if 0'ed? (21:35:50) nosnilmot: merging error afaict (21:35:52) interalia: datallah: talking to yourself is OK. it's when you answer that it becomes a problem... (21:35:54) LSchiere: i'm assuming it was done for a reason, temporary as that reason might be (21:36:04) nosnilmot: it's not #if 0'd in chip's svn tree (21:36:08) LSchiere: oddness (21:36:16) interalia: cvs annotate to the rescue! (21:36:23) LSchiere: was that part of datallah's patch failure handle patch? (21:36:49) datallah: yeah... i'm confused as to how it happened, but the first part happened during the plain merge and the #endif i added during the .rej cleanup iirc (21:37:31) nosnilmot: yup, datallah's right :) I suspect the #if 0 came in because "patch" was trying to "help" (21:37:47) LSchiere: okay, let's see what happens without that (21:38:11) nosnilmot: "it works a lot better and doesn't eat as many buddy lists for breakfast" (21:38:12) datallah: it definitely needs to not be commented out it compiles uncommented, so we'll go with their opinion committer: Tailor Script <[e-mail]>

/* This file is part of the Project Athena Zephyr Notification System.
 * It contains the ZCheckIfNotice/select loop used for waiting for
 * a notice, with a timeout.
 *
 *	Created by:	<Joe Random Hacker>
 *
 *	$Source$
 *	$Author: chipx86 $
 *
 *	Copyright (c) 1991 by the Massachusetts Institute of Technology.
 *	For copying and distribution information, see the file
 *	"mit-copyright.h". 
 */

#include "mit-copyright.h"

#ifndef lint
static char rcsid_ZWaitForNotice_c[] = "$Zephyr$";
#endif

#include "internal.h"
#include <sys/socket.h>

Code_t Z_WaitForNotice (notice, pred, arg, timeout)
     ZNotice_t *notice;
     int (*pred) __P((ZNotice_t *, void *));
     void *arg;
     int timeout;
{
  Code_t retval;
  struct timeval tv, t0;
  fd_set fdmask;
  int i, fd;

  retval = ZCheckIfNotice (notice, (struct sockaddr_in *) 0, pred,
			   (char *) arg);
  if (retval == ZERR_NONE)
    return ZERR_NONE;
  if (retval != ZERR_NONOTICE)
    return retval;

  fd = ZGetFD ();
  FD_ZERO (&fdmask);
  tv.tv_sec = timeout;
  tv.tv_usec = 0;
  gettimeofday (&t0, (struct timezone *) 0);
  t0.tv_sec += timeout;
  while (1) {
    FD_SET (fd, &fdmask);
    i = select (fd + 1, &fdmask, (fd_set *) 0, (fd_set *) 0, &tv);
    if (i == 0)
      return ETIMEDOUT;
    if (i < 0 && errno != EINTR)
      return errno;
    if (i > 0) {
      retval = ZCheckIfNotice (notice, (struct sockaddr_in *) 0, pred,
			       (char *) arg);
      if (retval != ZERR_NONOTICE) /* includes ZERR_NONE */
	return retval;
    }
    gettimeofday (&tv, (struct timezone *) 0);
    tv.tv_usec = t0.tv_usec - tv.tv_usec;
    if (tv.tv_usec < 0) {
      tv.tv_usec += 1000000;
      tv.tv_sec = t0.tv_sec - tv.tv_sec - 1;
    }
    else
      tv.tv_sec = t0.tv_sec - tv.tv_sec;
  }
  /*NOTREACHED*/
}