summaryrefslogtreecommitdiff
path: root/tildexpand.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-01-04 13:07:27 +0000
committerColin Watson <cjwatson@debian.org>2005-01-04 13:07:27 +0000
commitfd0f611b70a83d80fe8793af785542ee5541b7cd (patch)
treebededd22bb7eeec52e20083237ab7e4113445a16 /tildexpand.c
parentc44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff)
parentebd2ce335af5861020c79fddb1ae35c03bf036cf (diff)
Merge 3.9p1 to the trunk.
Diffstat (limited to 'tildexpand.c')
-rw-r--r--tildexpand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tildexpand.c b/tildexpand.c
index cbe981146..cedb653b2 100644
--- a/tildexpand.c
+++ b/tildexpand.c
@@ -11,11 +11,11 @@
11 */ 11 */
12 12
13#include "includes.h" 13#include "includes.h"
14RCSID("$OpenBSD: tildexpand.c,v 1.13 2002/06/23 03:25:50 deraadt Exp $"); 14RCSID("$OpenBSD: tildexpand.c,v 1.15 2004/05/21 08:43:03 markus Exp $");
15 15
16#include "xmalloc.h" 16#include "xmalloc.h"
17#include "log.h" 17#include "log.h"
18#include "tildexpand.h" 18#include "misc.h"
19 19
20/* 20/*
21 * Expands tildes in the file name. Returns data allocated by xmalloc. 21 * Expands tildes in the file name. Returns data allocated by xmalloc.