fix indent

This commit is contained in:
Fumitoshi UKAI
2003-01-17 17:06:57 +00:00
parent c09389519e
commit 264b3e35ec
4 changed files with 12 additions and 12 deletions

6
etc.c
View File

@@ -1,4 +1,4 @@
/* $Id: etc.c,v 1.51 2003/01/17 17:06:00 ukai Exp $ */ /* $Id: etc.c,v 1.52 2003/01/17 17:06:57 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <pwd.h> #include <pwd.h>
#include "myctype.h" #include "myctype.h"
@@ -1444,11 +1444,11 @@ expandName(char *name)
char *q; char *q;
p += 2; p += 2;
q = strchr(p, '/'); q = strchr(p, '/');
if (q) { /* /~user/dir... */ if (q) { /* /~user/dir... */
passent = getpwnam(allocStr(p, q - p)); passent = getpwnam(allocStr(p, q - p));
p = q; p = q;
} }
else { /* /~user */ else { /* /~user */
passent = getpwnam(p); passent = getpwnam(p);
p = ""; p = "";
} }

10
indep.c
View File

@@ -1,4 +1,4 @@
/* $Id: indep.c,v 1.29 2003/01/17 17:06:02 ukai Exp $ */ /* $Id: indep.c,v 1.30 2003/01/17 17:07:00 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <stdio.h> #include <stdio.h>
#include <pwd.h> #include <pwd.h>
@@ -188,12 +188,12 @@ expandPath(char *name)
p++; p++;
if (IS_ALPHA(*p)) { if (IS_ALPHA(*p)) {
char *q = strchr(p, '/'); char *q = strchr(p, '/');
if (q) { /* ~user/dir... */ if (q) { /* ~user/dir... */
passent = getpwnam(allocStr(p, q - p)); passent = getpwnam(allocStr(p, q - p));
p = q; p = q;
} }
else { /* ~user */ else { /* ~user */
passent = getpwnam(p); passent = getpwnam(p);
p = ""; p = "";
} }
if (!passent) if (!passent)

View File

@@ -1,4 +1,4 @@
/* $Id: local.c,v 1.23 2003/01/17 17:06:03 ukai Exp $ */ /* $Id: local.c,v 1.24 2003/01/17 17:07:00 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@@ -300,7 +300,7 @@ checkPath(char *fn, char *path)
Str tmp; Str tmp;
struct stat st; struct stat st;
while (*path) { while (*path) {
p = strchr(path, ':'); p = strchr(path, ':');
tmp = Strnew_charp(expandPath(p ? allocStr(path, p - path) : path)); tmp = Strnew_charp(expandPath(p ? allocStr(path, p - path) : path));
if (Strlastchar(tmp) != '/') if (Strlastchar(tmp) != '/')
Strcat_char(tmp, '/'); Strcat_char(tmp, '/');

4
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.77 2003/01/17 17:06:05 ukai Exp $ */ /* $Id: rc.c,v 1.78 2003/01/17 17:07:02 ukai Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -1580,7 +1580,7 @@ rcFile(char *base)
(base[0] == '.' (base[0] == '.'
&& (base[1] == '/' || (base[1] == '.' && base[2] == '/'))) && (base[1] == '/' || (base[1] == '.' && base[2] == '/')))
|| (base[0] == '~' && base[1] == '/'))) || (base[0] == '~' && base[1] == '/')))
/* /file, ./file, ../file, ~/file */ /* /file, ./file, ../file, ~/file */
return expandPath(base); return expandPath(base);
return expandPath(Strnew_m_charp(rc_dir, "/", base, NULL)->ptr); return expandPath(Strnew_m_charp(rc_dir, "/", base, NULL)->ptr);
} }