bti: allow compilation on non-GNU platforms

Avoid using strchrnul, it's a GNU addition.  The code in question,
actually doesn't really benefit from strchrnul's behaviour.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/config.c b/config.c
index e06f480bc87078a5585e373a035634042332ee9a..2b510b90276d8a31bfa9c9ccbfaa23c12bfb65f0 100644 (file)
--- a/config.c
+++ b/config.c
@@ -351,20 +351,21 @@ void bti_parse_configfile(struct session *session)
                 * marker if it occurs at the beginning of the line, or after
                 * whitespace
                 */
                 * marker if it occurs at the beginning of the line, or after
                 * whitespace
                 */

-               hashmarker = strchrnul(line, '#');
+               hashmarker = strchr(line, '#');

                if (line == hashmarker)
                        line[0] = '\0';
                else {
                if (line == hashmarker)
                        line[0] = '\0';
                else {

-                       while (hashmarker[0] != '\0') {
+                       while (hashmarker != NULL) {

                                --hashmarker;
                                --hashmarker;

-                               if (isblank(hashmarker[0]))
+                               if (isblank(hashmarker[0])) {

                                        hashmarker[0] = '\0';
                                        hashmarker[0] = '\0';

-                               else {
+                                       break;
+                               } else {

                                        /*
                                         * false positive; '#' occured
                                         * within a string
                                         */
                                        /*
                                         * false positive; '#' occured
                                         * within a string
                                         */

-                                       hashmarker = strchrnul(hashmarker+2, '#');
+                                       hashmarker = strchr(hashmarker+2, '#');

                                }
                        }
                }
                                }
                        }
                }