[prev in list] [next in list] [prev in thread] [next in thread] 

List:       proftpd-committers
Subject:    [ProFTPD-committers] CVS: proftpd/src dirtree.c,1.170,1.171 support.c,1.77,1.78
From:       TJ Saunders <castaglia () users ! sourceforge ! net>
Date:       2005-09-28 2:06:29
Message-ID: E1EKRL3-000782-5x () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/proftp/proftpd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27390/src

Modified Files:
	dirtree.c support.c 
Log Message:

Style.


Index: dirtree.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/dirtree.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- dirtree.c	23 Aug 2005 16:25:02 -0000	1.170
+++ dirtree.c	28 Sep 2005 02:06:26 -0000	1.171
@@ -2251,24 +2251,25 @@
 /* Iterate through directory configuration items and resolve ~ references. */
 void resolve_deferred_dirs(server_rec *s) {
   config_rec *c;
-  char *realdir;
 
-  if (!s || !s->conf)
+  if (!s ||
+      !s->conf)
     return;
 
-  for (c = (config_rec*)s->conf->xas_list; c; c=c->next) {
-    if (c->config_type == CONF_DIR && (c->flags & CF_DEFER)) {
+  for (c = (config_rec *) s->conf->xas_list; c; c = c->next) {
+    if (c->config_type == CONF_DIR &&
+        (c->flags & CF_DEFER)) {
+      char *realdir;
 
       /* Check for any expandable variables. */
       c->name = path_subst_uservar(c->pool, &c->name);
 
-      realdir = dir_best_path(c->pool,c->name);
-
-      if (realdir)
+      realdir = dir_best_path(c->pool, c->name);
+      if (realdir) {
         c->name = realdir;
 
-      else {
-        realdir = dir_canonical_path(c->pool,c->name);
+      } else {
+        realdir = dir_canonical_path(c->pool, c->name);
         if (realdir)
           c->name = realdir;
       }

Index: support.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/support.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- support.c	18 Mar 2005 18:25:55 -0000	1.77
+++ support.c	28 Sep 2005 02:06:26 -0000	1.78
@@ -215,7 +215,7 @@
 }
 
 /* dir_best_path() creates the "most" fully canonicalized path possible
- * (i.e. if path components at the end don't exist, they are ignored
+ * (i.e. if path components at the end don't exist, they are ignored).
  */
 char *dir_best_path(pool *p, const char *path) {
   char workpath[PR_TUNABLE_PATH_MAX + 1] = {'\0'};



-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]