Ticket #40: name_collision_no_seperator.patch

avahi-common/alternative.c

@@ -37 +37 @@
 
     assert(s);
 
-    e = s;
-    
     for (p = s; *p; p++)
-        if (!isdigit(*p))
+        if ((*p == '-') && isdigit(p+1))
             e = p+1;
 
     if (*e) {
@@ -53 +51 @@
         avahi_free(c);
         
     } else
-        r = avahi_strdup_printf("%s2", s);
+        r = avahi_strdup_printf("%s-2", s);
     
     return r;
 }