From fc7816fd4ed33c7909345a5fbffac48d3afcc7fe Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 30 Oct 2017 15:32:56 +0000
Subject: [PATCH] Revert "foo"

This reverts commit 27d5a7bce09aef83d3349cca5f3777007b3b94b6.

I fat fingered it, failing to reset the checkout before applying the
sequential commit.
---
 src/compiler/glsl/linker.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index e7ec9b7bc03..f827b68555f 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -3653,21 +3653,21 @@ included_in_packed_varying(ir_variable *var, const char *name)
    if (strncmp(var->name, "packed:", 7) != 0)
       return false;
 
-   const char *token = var->name + 7;
-   while (token) {
-      const char *next_token = strchr(list, ' ');
-      if (next_token) {
-         len = token - next_token;
-         next_token++;
-      } else {
-         len = strlen(token);
-      }
-      if (strncmp(token, name, MAX2(len, strlen(name)) == 0)
-         return true;
+   char *list = strdup(var->name + 7);
+   assert(list);
 
-      token = next_token;
+   bool found = false;
+   char *saveptr;
+   char *token = strtok_r(list, ",", &saveptr);
+   while (token) {
+      if (strcmp(token, name) == 0) {
+         found = true;
+         break;
+      }
+      token = strtok_r(NULL, ",", &saveptr);
    }
-   return false;
+   free(list);
+   return found;
 }
 
 /**