added a linkbot example to libirc, bunch of random shit in segfault I guess. I don't remember. I should commit more.

1 files changed, 74 insertions, 84 deletions

diff --git a/libirc/libirc.c b/libirc/libirc.c
index d2bff54..7968f76 100644
--- a/libirc/libirc.c
+++ b/libirc/libirc.c
@@ -132,15 +132,14 @@ int runit(int fd,void (*line_handler)(),void (*extra_handler)()) {
  return 0;
 }
 
-#if 0
 //yeah. this is a copy of the previous function.
 //with a bit of different stuff. didn't want to break anything yet.
-int runem(int *fd,void (*line_handler)(),void (*extra_handler)()) {
- FILE *fp;
+int runem(int *fds,void (*line_handler)(),void (*extra_handler)()) {
  fd_set master;
  fd_set readfs;
  struct timeval timeout;
  int fdmax=0,n,s,i;
+ int fd;
  char *backlog=malloc(CHUNK+1);
  char *t,*line=0;
  int blsize=CHUNK;
@@ -149,92 +148,89 @@ int runem(int *fd,void (*line_handler)(),void (*extra_handler)()) {
  if(!backlog) return 252;
  FD_ZERO(&master);
  FD_ZERO(&readfs);
- for(i=0;fd[i] != -1;i++) {
-  FD_SET(fd,&master);
-  fdmax=fd>fdmax?fd:fdmax;
+ for(i=0;fds[i] != -1;i++) {
+  FD_SET(fds[i],&master);
+  fdmax=fds[i]>fdmax?fds[i]:fdmax;
  }
- fp=fdopen(fd,"rw");
  memset(backlog,0,CHUNK);
  memset(buffer,0,CHUNK);
- if(fd) {
-  int done=0;
-  while(!done) {
-   for(fd=0;fd<=fdmax;fd++) {
-    if(FD_ISSET(fd,&master)) {
-     extra_handler(fd);
-    }
+ int done=0;
+ while(!done) {
+  for(fd=0;fd<=fdmax;fd++) {
+   if(FD_ISSET(fd,&master)) {
+    extra_handler(fd);
    }
-   readfs=master;
-   timeout.tv_sec=0;
-   timeout.tv_usec=1000;
-   if( select(fdmax+1,&readfs,0,0,&timeout) == -1 ) {
-    printf("\n!!!It is crashing here!!!\n\n");
-    perror("select");
-    return 1;
-   }
-   for(fd=0;fd<=fdmax;fd++) {
-    if(FD_ISSET(fd,&readfs)) {
-     if((n=recv(fd,buffer,CHUNK,0)) <= 0) {//read CHUNK bytes
-      fprintf(stderr,"recv: %d\n",n);
-      perror("recv");
-      return 2;
-     } else {
-      buffer[n]=0;//deff right.
-      if(bllen+n >= blsize) {//this is probably off...
-       blsize+=n;
-       t=malloc(blsize);
-       if(!t) {
-        printf("OH FUCK! MALLOC FAILED!\n");
-        exit(253);
-       }
-       memset(t,0,blsize);//optional?
-       memcpy(t,backlog,blsize-n+1);//???
-       free(backlog);
-       backlog=t;
+  }
+  readfs=master;
+  timeout.tv_sec=0;
+  timeout.tv_usec=1000;
+  if( select(fdmax+1,&readfs,0,0,&timeout) == -1 ) {
+   printf("\n!!!It is rashing here!!!\n\n");
+   perror("select");
+   return 1;
+  }
+  for(fd=0;fd<=fdmax;fd++) {
+   if(FD_ISSET(fd,&readfs)) {
+    if((n=recv(fd,buffer,CHUNK,0)) <= 0) {//read CHUNK bytes
+     fprintf(stderr,"recv: %d\n",n);
+     perror("recv");
+     return 2;
+    } else {
+     buffer[n]=0;//deff right.
+     if(bllen+n >= blsize) {//this is probably off...
+      blsize+=n;
+      t=malloc(blsize);
+      if(!t) {
+       printf("OH FUCK! MALLOC FAILED!\n");
+       exit(253);
       }
-      memcpy(backlog+bllen,buffer,n);
-      bllen+=n;
-      for(i=0,s=0;i<bllen;i++) {
-       if(backlog[i]=='\n') {
-        line=malloc(i-s+3);//on linux it crashes without the +1 +3? weird. when did I do that?
-        if(!line) {
-         printf("ANOTHER malloc error!\n");
-         exit(254);
-        }
-        memcpy(line,backlog+s,i-s+2);
-        line[i-s+1]=0;//gotta null terminate this. line_handler expects it .
-        s=i+1;//the character after the newline.
-        if(!strncmp(line,"PING",4)) {
-         t=malloc(strlen(line));
-         strcpy(t,"PONG ");
-         strcat(t,line+6);
- 	write(fd,t,strlen(t));
-         //fprintf(fp,"PONG %s",line+6);//a whole FILE * and fdopen JUST for this??? oy...
-         //fflush(fp);
+      memset(t,0,blsize);//optional?
+      memcpy(t,backlog,blsize-n+1);//???
+      free(backlog);
+      backlog=t;
+     }
+     memcpy(backlog+bllen,buffer,n);
+     bllen+=n;
+     for(i=0,s=0;i<bllen;i++) {
+      if(backlog[i]=='\n') {
+       line=malloc(i-s+3);//on linux it crashes without the +1 +3? weird. when did I do that?
+       if(!line) {
+        printf("ANOTHER malloc error!\n");
+        exit(254);
+       }
+       memcpy(line,backlog+s,i-s+2);
+       line[i-s+1]=0;//gotta null terminate this. line_handler expects it .
+       s=i+1;//the character after the newline.
+       if(!strncmp(line,"PING",4)) {
+        t=malloc(strlen(line));
+        strcpy(t,"PONG ");
+        strcat(t,line+6);
+        write(fd,t,strlen(t));
+        //fprintf(fp,"PONG %s",line+6);//a whole FILE * and fdopen JUST for this??? oy...
+        //fflush(fp);
  #ifdef DEBUG
-         printf("%s\nPONG %s\n",line,line+6);
-         write(fd,"PRIVMSG %s :PONG! w00t!\r\n",DEBUG,28);
+        printf("%s\nPONG %s\n",line,line+6);
+        write(fd,"PRIVMSG %s :PONG! w00t!\r\n",DEBUG,28);
  #endif
-        } else if(!strncmp(line,"ERROR",5)) {
+       } else if(!strncmp(line,"ERROR",5)) {
  #ifdef DEBUG
-         printf("error: %s\n",line);
+        printf("error: %s\n",line);
  #endif
-         return 0;
-        } else {
-         line_handler(fd,line);
-        }
-        free(line);
+        return 0;
+       } else {
+        line_handler(fd,line);
        }
+       free(line);
       }
-      //left shift the backlog so the last thing we got to is at the start
-      if(s > bllen) { //if the ending position is after the size of the backlog...
-       bllen=0;//fuck shifting. :P
-      } else {
-       for(i=s;i<=bllen;i++) {//should work.
-        backlog[i-s]=backlog[i];
-       }
-       bllen-=s;
+     }
+     //left shift the backlog so the last thing we got to is at the start
+     if(s > bllen) { //if the ending position is after the size of the backlog...
+      bllen=0;//fuck shifting. :P
+     } else {
+      for(i=s;i<=bllen;i++) {//should work.
+       backlog[i-s]=backlog[i];
       }
+      bllen-=s;
      }
     }
    }
@@ -242,13 +238,8 @@ int runem(int *fd,void (*line_handler)(),void (*extra_handler)()) {
  }
  return 0;
 }
-#endif
 
-//:hack.thebackupbox.net 433 * sysbot :Nickname is already in use.
-//Need to have it check for this.
-//and try a nick?
-//or something...
-//I don't want to add any string parsing to this function. :/
+//not needed?
 int ircConnect(char *serv,char *port,char *nick,char *user) {
  char sendstr[1024];
  int fd;
@@ -260,4 +251,3 @@ int ircConnect(char *serv,char *port,char *nick,char *user) {
  write(fd,sendstr,strlen(sendstr));
  return fd;
 }
-