From: Alexandre P Francisco <aplf@tecnico.pt>
Date: Tue, 23 Feb 2016 16:58:59 +0000 (+0000)
Subject: Update aula02/ex11.
X-Git-Url: http://web.ist.utl.pt/aplf/git/?a=commitdiff_plain;h=bcdc6f3599d8a91fef555cc47752282826c541c9;p=iaed.git

Update aula02/ex11.
---

diff --git a/aula02/ex11.c b/aula02/ex11.c
index 9dc219a..b4e472d 100644
--- a/aula02/ex11.c
+++ b/aula02/ex11.c
@@ -6,9 +6,10 @@
  
 int main ()
 {
-    int c;
-    long maiusculas = 0, minusculas = 0, algarismos = 0, outros = 0, vazias = 0;
+    int c, pc;
+    long maiusculas = 0, minusculas = 0, algarismos = 0, outros = 0, nao_vazias = 0, vazias = 0;
    
+    pc = EOF;
     while ((c = getchar()) != EOF)
     {
         if (c >= 'a' && c<='z')
@@ -19,12 +20,23 @@ int main ()
             algarismos++;
         else
             outros++;
+
+        if (c == '\n' && pc == '\n')
+            vazias++;
+        else if (c == '\n')
+            nao_vazias++;
+        pc = c;
     }
  
     printf("%ld minusculas\n",minusculas);
     printf("%ld maiusculas\n",maiusculas);
     printf("%ld algarismos\n",algarismos);
     printf("%ld outros caracteres\n",outros);
+    printf("%ld caracteres no total\n",minusculas+maiusculas+algarismos+outros);
+
+    printf("%ld linhas vazias\n",vazias);
+    printf("%ld linhas nao vazias\n",nao_vazias);
+    printf("%ld linhas no total\n",nao_vazias+vazias);
  
     return 0;
 }