===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/tildexpand.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/ssh/Attic/tildexpand.c	1999/09/30 16:48:48	1.2
+++ src/usr.bin/ssh/Attic/tildexpand.c	1999/11/23 22:25:56	1.3
@@ -12,7 +12,7 @@
 */
 
 #include "includes.h"
-RCSID("$Id: tildexpand.c,v 1.2 1999/09/30 16:48:48 deraadt Exp $");
+RCSID("$Id: tildexpand.c,v 1.3 1999/11/23 22:25:56 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -20,51 +20,48 @@
 /* Expands tildes in the file name.  Returns data allocated by xmalloc.
    Warning: this calls getpw*. */
 
-char *tilde_expand_filename(const char *filename, uid_t my_uid)
+char *
+tilde_expand_filename(const char *filename, uid_t my_uid)
 {
-  const char *cp;
-  unsigned int userlen;
-  char *expanded;
-  struct passwd *pw;
-  char user[100];
+	const char *cp;
+	unsigned int userlen;
+	char *expanded;
+	struct passwd *pw;
+	char user[100];
 
-  /* Return immediately if no tilde. */
-  if (filename[0] != '~')
-    return xstrdup(filename);
+	/* Return immediately if no tilde. */
+	if (filename[0] != '~')
+		return xstrdup(filename);
 
-  /* Skip the tilde. */
-  filename++;
+	/* Skip the tilde. */
+	filename++;
 
-  /* Find where the username ends. */
-  cp = strchr(filename, '/');
-  if (cp)
-    userlen = cp - filename;  /* Have something after username. */
-  else
-    userlen = strlen(filename); /* Nothign after username. */
-  if (userlen == 0)
-    pw = getpwuid(my_uid);  /* Own home directory. */
-  else
-    {
-      /* Tilde refers to someone elses home directory. */
-      if (userlen > sizeof(user) - 1)
-	fatal("User name after tilde too long.");
-      memcpy(user, filename, userlen);
-      user[userlen] = 0;
-      pw = getpwnam(user);
-    }
+	/* Find where the username ends. */
+	cp = strchr(filename, '/');
+	if (cp)
+		userlen = cp - filename;	/* Have something after username. */
+	else
+		userlen = strlen(filename);	/* Nothign after username. */
+	if (userlen == 0)
+		pw = getpwuid(my_uid);	/* Own home directory. */
+	else {
+		/* Tilde refers to someone elses home directory. */
+		if (userlen > sizeof(user) - 1)
+			fatal("User name after tilde too long.");
+		memcpy(user, filename, userlen);
+		user[userlen] = 0;
+		pw = getpwnam(user);
+	}
+	/* Check that we found the user. */
+	if (!pw)
+		fatal("Unknown user %100s.", user);
 
-  /* Check that we found the user. */
-  if (!pw)
-    fatal("Unknown user %100s.", user);
-  
-  /* If referring to someones home directory, return it now. */
-  if (!cp)
-    { /* Only home directory specified */
-      return xstrdup(pw->pw_dir);
-    }
-  
-  /* Build a path combining the specified directory and path. */
-  expanded = xmalloc(strlen(pw->pw_dir) + strlen(cp + 1) + 2);
-  sprintf(expanded, "%s/%s", pw->pw_dir, cp + 1);
-  return expanded;
+	/* If referring to someones home directory, return it now. */
+	if (!cp) {		/* Only home directory specified */
+		return xstrdup(pw->pw_dir);
+	}
+	/* Build a path combining the specified directory and path. */
+	expanded = xmalloc(strlen(pw->pw_dir) + strlen(cp + 1) + 2);
+	sprintf(expanded, "%s/%s", pw->pw_dir, cp + 1);
+	return expanded;
 }