# HG changeset patch
# User ib
# Date 1396518461 0
# Node ID 0790f864cea2845c2da75af19bb3a3fbfbdf1932
# Parent  1236a692d0c6b3d46a1b2338a95d485c17c9ac65
Add a file for miscellaneous auxiliary functions.

Move fgetstr() from string.c there.

diff -r 1236a692d0c6 -r 0790f864cea2 Makefile
--- a/Makefile	Thu Apr 03 07:55:12 2014 +0000
+++ b/Makefile	Thu Apr 03 09:47:41 2014 +0000
@@ -523,6 +523,7 @@
                                 gui/ui/playbar.c                        \
                                 gui/ui/render.c                         \
                                 gui/ui/video.c                          \
+                                gui/util/misc.c                         \
                                 gui/wm/ws.c                             \
                                 gui/wm/wsxdnd.c                         \
 
diff -r 1236a692d0c6 -r 0790f864cea2 gui/app/cfg.c
--- a/gui/app/cfg.c	Thu Apr 03 07:55:12 2014 +0000
+++ b/gui/app/cfg.c	Thu Apr 03 09:47:41 2014 +0000
@@ -24,6 +24,7 @@
 #include "gui.h"
 #include "gui/interface.h"
 #include "gui/util/list.h"
+#include "gui/util/misc.h"
 #include "gui/util/string.h"
 
 #include "config.h"
diff -r 1236a692d0c6 -r 0790f864cea2 gui/skin/font.c
--- a/gui/skin/font.c	Thu Apr 03 07:55:12 2014 +0000
+++ b/gui/skin/font.c	Thu Apr 03 09:47:41 2014 +0000
@@ -29,6 +29,7 @@
 #include "font.h"
 #include "skin.h"
 #include "gui/util/mem.h"
+#include "gui/util/misc.h"
 #include "gui/util/string.h"
 
 #include "mp_msg.h"
diff -r 1236a692d0c6 -r 0790f864cea2 gui/skin/skin.c
--- a/gui/skin/skin.c	Thu Apr 03 07:55:12 2014 +0000
+++ b/gui/skin/skin.c	Thu Apr 03 09:47:41 2014 +0000
@@ -30,6 +30,7 @@
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/dialog/dialog.h"
+#include "gui/util/misc.h"
 #include "gui/util/string.h"
 
 #include "help_mp.h"
diff -r 1236a692d0c6 -r 0790f864cea2 gui/util/misc.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui/util/misc.c	Thu Apr 03 09:47:41 2014 +0000
@@ -0,0 +1,49 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * @file
+ * @brief Miscellaneous utilities
+ */
+
+#include <string.h>
+
+#include "misc.h"
+
+/**
+ * @brief Read characters from @a file.
+ *
+ * @param str pointer to a buffer to receive the read characters
+ * @param size number of characters read at the most (including a terminating null-character)
+ * @param file file to read from
+ *
+ * @return str (success) or NULL (error)
+ *
+ * @note Reading stops with an end-of-line character or at end of file.
+ */
+char *fgetstr(char *str, int size, FILE *file)
+{
+    char *s;
+
+    s = fgets(str, size, file);
+
+    if (s)
+        s[strcspn(s, "\n\r")] = 0;
+
+    return s;
+}
diff -r 1236a692d0c6 -r 0790f864cea2 gui/util/misc.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui/util/misc.h	Thu Apr 03 09:47:41 2014 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_GUI_MISC_H
+#define MPLAYER_GUI_MISC_H
+
+#include <stdio.h>
+
+char *fgetstr(char *str, int size, FILE *file);
+
+#endif /* MPLAYER_GUI_MISC_H */
diff -r 1236a692d0c6 -r 0790f864cea2 gui/util/string.c
--- a/gui/util/string.c	Thu Apr 03 07:55:12 2014 +0000
+++ b/gui/util/string.c	Thu Apr 03 09:47:41 2014 +0000
@@ -21,6 +21,7 @@
  * @brief String utilities
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -317,26 +318,3 @@
     if (*old)
         sprintf(*old, "%s/%s", dir, name);
 }
-
-/**
- * @brief Read characters from @a file.
- *
- * @param str pointer to a buffer to receive the read characters
- * @param size number of characters read at the most (including a terminating null-character)
- * @param file file to read from
- *
- * @return str (success) or NULL (error)
- *
- * @note Reading stops with an end-of-line character or at end of file.
- */
-char *fgetstr(char *str, int size, FILE *file)
-{
-    char *s;
-
-    s = fgets(str, size, file);
-
-    if (s)
-        s[strcspn(s, "\n\r")] = 0;
-
-    return s;
-}
diff -r 1236a692d0c6 -r 0790f864cea2 gui/util/string.h
--- a/gui/util/string.h	Thu Apr 03 07:55:12 2014 +0000
+++ b/gui/util/string.h	Thu Apr 03 09:47:41 2014 +0000
@@ -20,7 +20,6 @@
 #define MPLAYER_GUI_STRING_H
 
 #include <stddef.h>
-#include <stdio.h>
 
 /**
  * @brief Wraps #cutString():
@@ -32,7 +31,6 @@
 int cutInt(char *in, char sep, int num);
 void cutString(char *in, char *out, char sep, int num, size_t maxout);
 char *decomment(char *in);
-char *fgetstr(char *str, int size, FILE *file);
 char *gstrchr(const char *str, int c);
 int gstrcmp(const char *a, const char *b);
 char *gstrdup(const char *str);