X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=misc.c;h=22ebc800ef941cab85154079e42be606c7a2efb1;hb=2f465ba5e73ba05745d23f0fca9d5bdb1b350d8c;hp=73154e85604049a49098bbdbece3e2bc7952b03b;hpb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;p=pkg%2Fabook.git

diff --git a/misc.c b/misc.c
index 73154e8..22ebc80 100644
--- a/misc.c
+++ b/misc.c
@@ -5,6 +5,8 @@
  * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
+ * getaline() Copyright (C) Lars Wirzenius
+ * sprintf and snprintf copyright is owned by various people
  */
 
 #include <stdio.h>
@@ -16,9 +18,7 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#ifdef HANDLE_MULTIBYTE
-#	include <mbswidth.h>
-#endif
+#include <mbswidth.h>
 #include "misc.h"
 #include "xmalloc.h"
 
@@ -80,7 +80,7 @@ strtrim(char *s)
 #endif
 
 char *
-mkstr (const char *format, ... )
+strdup_printf (const char *format, ... )
 {
 	MY_VA_LOCAL_DECL;
 	size_t size = 100;
@@ -126,10 +126,7 @@ strconcat (const char *str, ...)
 	}
 	MY_VA_END;
 
-	concat = (char *)
-	xmalloc(l);
-	if(concat == NULL)
-		return NULL;
+	concat =  xmalloc(l);
 
 	strcpy (concat, str);
 	MY_VA_START(str);
@@ -186,7 +183,33 @@ my_getcwd()
 	return dir;
 }
 
-#define INITIAL_SIZE	128
+/*
+ * getaline()
+ *
+ * Copyright (c) 1994 Lars Wirzenius
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 char *
 getaline(FILE *f)
@@ -249,11 +272,7 @@ int
 strwidth(const char *s)
 {
 	assert(s);
-#ifdef HANDLE_MULTIBYTE
-	return (int)mbswidth(s, 0);
-#else
-	return strlen(s);
-#endif
+	return mbswidth(s, 0);
 }
 
 int