Minsk: Accept \r\n

[minsk.git] / minsk.c

diff --git a/minsk.c b/minsk.c
index ab9e42a80b2b2a54d8de0f7a9b7983ca12de676c..4b4b2a3995ac5fd2ab0907a14a7fce692606b5d9 100644 (file)
--- a/minsk.c
+++ b/minsk.c
@@ -185,6 +185,8 @@ static void parse_in(void)
       if (!eol)
        parse_error("Строка слишком долгая");
       *eol = 0;
+      if (eol > line && eol[-1] == '\r')
+       *--eol = 0;
 
       char *c = line;
       if (!c[0] || c[0] == ';')
@@ -198,6 +200,9 @@ static void parse_in(void)
          continue;
        }
 
+      if (c[0] == '.')
+       return;
+
       if (c[0] == '@')
        {
          c++;
@@ -819,9 +824,9 @@ static void run(void)
 #define TBF_MAX 5                      // Max number of tokens in the bucket
 #define TBF_REFILL_PER_SEC 0.2         // Bucket refill rate (buckets/sec)
 
-#define PID_FILE "/var/run/minsk.pid"
-#define UID 65534
-#define GID 65534
+#define PID_FILE "/var/run/pd-minsk.pid"
+#define UID 124
+#define GID 125
 
 static void die(char *msg)
 {