DistRen Changeset - f90b55fcef6d · protofusion repositories

Changeset - f90b55fcef6d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-08-03 23:38:39
ohnobinki@ohnopublishing.net

fixed errorneous references to aserver

1 file changed with 2 insertions and 2 deletions:

src/common/remoteio.c

0 comments (0 inline, 0 general)

src/common/remoteio.c

➞

Show inline comments

@@ @@ -54,99 +54,99 @@ int remoteio_config(cfg_t *cfg, struct r @@
       if(!aserver) /*< if the malloc in the previous loop failed */
 	abort();
       aserver->name = strdup(cfg_title(cfg_aserver));
       aserver->hostname = strdup(cfg_getstr(cfg_aserver, "hostname"));
       aserver->username = strdup(cfg_getstr(cfg_aserver, "username"));
       if(strcmp(cfg_getstr(cfg_aserver, "method"), "ssh") == 0)
 	aserver->method = REMOTEIO_METHOD_SSH;
       else
 	abort();
       if(counter < numservers - 1)
+	{
 	  aserver->next = malloc(sizeof(struct remoteio_server));
 	  aserver = aserver->next;
+	}
+    }
   aserver->next = NULL;
   return 0;
+}
 int remoteio_open(struct remoteio **rem, struct remoteio_opts *opts, const char *servername)
+{
   char *userhost;
   char *sshargs[] = {opts->ssh_command, NULL /* userhost */, "distrend", "-d", (char *)NULL};
   int rtn;
   struct remoteio_server *theserver;
   theserver = remoteio_getserver(opts, servername);
   if(!theserver)
+    {
       fprintf(stderr, "%s:%d: Could not find server named ``%s''\n", __FILE__, __LINE__, servername);
       return 1;
+    }
   if(theserver->method != REMOTEIO_METHOD_SSH)
+    {
       fprintf(stderr, "%s:%d: Unsupported remoteio method %d\n", __FILE__, __LINE__, theserver->method);
       return 1;
+    }
   if(theserver->username)
-    _distren_asprintf(&userhost, "%s@%s", aserver->username, aserver->hostname);
+    _distren_asprintf(&userhost, "%s@%s", theserver->username, theserver->hostname);
   else
-    userhost = strdup(aserver->hostname);
+    userhost = strdup(theserver->hostname);
   sshargs[1] = userhost;
   *rem = malloc(sizeof(struct remoteio));
   rtn = execio_open( &(*rem)->execio, "ssh", sshargs);
   if(rtn)
+    {
       fprintf(stderr, "error opening remoteio channel to server ``%s''" , servername);
       free(*rem);
       free(userhost);
       return 1;
+    }
   free(userhost);
   return 0;
+}
 int remoteio_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread)
+{
   return execio_read(rem->execio, buf, len, bytesread);
+}
 int remoteio_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten)
+{
   return execio_write(rem->execio, buf, len, byteswritten);
+}
 int remoteio_close(struct remoteio *rem)
+{
   int rtn;
   rtn = execio_close(rem->execio);
   free(rem);
   return 0 + rtn;
+}
 struct remoteio_server *remoteio_getserver(const struct remoteio_opts *opts, const char *servername)
+{
   struct remoteio_server *aserver;
   for(aserver = opts->servers;
       aserver;
       aserver = aserver->next)
     if(!strcmp(servername, aserver->name))
       return aserver;

0 comments (0 inline, 0 general)